diff options
-rw-r--r-- | Documentation/filesystems/Locking | 1 | ||||
-rw-r--r-- | Documentation/filesystems/vfs.txt | 1 | ||||
-rw-r--r-- | fs/aio.c | 14 | ||||
-rw-r--r-- | fs/ntfs/dir.c | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 1 |
5 files changed, 0 insertions, 19 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 14cdc101d165..1b5f15653b1b 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
@@ -447,7 +447,6 @@ prototypes: | |||
447 | int (*flush) (struct file *); | 447 | int (*flush) (struct file *); |
448 | int (*release) (struct inode *, struct file *); | 448 | int (*release) (struct inode *, struct file *); |
449 | int (*fsync) (struct file *, loff_t start, loff_t end, int datasync); | 449 | int (*fsync) (struct file *, loff_t start, loff_t end, int datasync); |
450 | int (*aio_fsync) (struct kiocb *, int datasync); | ||
451 | int (*fasync) (int, struct file *, int); | 450 | int (*fasync) (int, struct file *, int); |
452 | int (*lock) (struct file *, int, struct file_lock *); | 451 | int (*lock) (struct file *, int, struct file_lock *); |
453 | ssize_t (*readv) (struct file *, const struct iovec *, unsigned long, | 452 | ssize_t (*readv) (struct file *, const struct iovec *, unsigned long, |
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index d619c8d71966..b5039a00caaf 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt | |||
@@ -828,7 +828,6 @@ struct file_operations { | |||
828 | int (*flush) (struct file *, fl_owner_t id); | 828 | int (*flush) (struct file *, fl_owner_t id); |
829 | int (*release) (struct inode *, struct file *); | 829 | int (*release) (struct inode *, struct file *); |
830 | int (*fsync) (struct file *, loff_t, loff_t, int datasync); | 830 | int (*fsync) (struct file *, loff_t, loff_t, int datasync); |
831 | int (*aio_fsync) (struct kiocb *, int datasync); | ||
832 | int (*fasync) (int, struct file *, int); | 831 | int (*fasync) (int, struct file *, int); |
833 | int (*lock) (struct file *, int, struct file_lock *); | 832 | int (*lock) (struct file *, int, struct file_lock *); |
834 | ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); | 833 | ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); |
@@ -1472,20 +1472,6 @@ rw_common: | |||
1472 | kfree(iovec); | 1472 | kfree(iovec); |
1473 | break; | 1473 | break; |
1474 | 1474 | ||
1475 | case IOCB_CMD_FDSYNC: | ||
1476 | if (!file->f_op->aio_fsync) | ||
1477 | return -EINVAL; | ||
1478 | |||
1479 | ret = file->f_op->aio_fsync(req, 1); | ||
1480 | break; | ||
1481 | |||
1482 | case IOCB_CMD_FSYNC: | ||
1483 | if (!file->f_op->aio_fsync) | ||
1484 | return -EINVAL; | ||
1485 | |||
1486 | ret = file->f_op->aio_fsync(req, 0); | ||
1487 | break; | ||
1488 | |||
1489 | default: | 1475 | default: |
1490 | pr_debug("EINVAL: no operation provided\n"); | 1476 | pr_debug("EINVAL: no operation provided\n"); |
1491 | return -EINVAL; | 1477 | return -EINVAL; |
diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c index a18613579001..0ee19ecc982d 100644 --- a/fs/ntfs/dir.c +++ b/fs/ntfs/dir.c | |||
@@ -1544,8 +1544,6 @@ const struct file_operations ntfs_dir_ops = { | |||
1544 | .iterate = ntfs_readdir, /* Read directory contents. */ | 1544 | .iterate = ntfs_readdir, /* Read directory contents. */ |
1545 | #ifdef NTFS_RW | 1545 | #ifdef NTFS_RW |
1546 | .fsync = ntfs_dir_fsync, /* Sync a directory to disk. */ | 1546 | .fsync = ntfs_dir_fsync, /* Sync a directory to disk. */ |
1547 | /*.aio_fsync = ,*/ /* Sync all outstanding async | ||
1548 | i/o operations on a kiocb. */ | ||
1549 | #endif /* NTFS_RW */ | 1547 | #endif /* NTFS_RW */ |
1550 | /*.ioctl = ,*/ /* Perform function on the | 1548 | /*.ioctl = ,*/ /* Perform function on the |
1551 | mounted filesystem. */ | 1549 | mounted filesystem. */ |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 16d2b6e874d6..ff7bcd9e8398 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1709,7 +1709,6 @@ struct file_operations { | |||
1709 | int (*flush) (struct file *, fl_owner_t id); | 1709 | int (*flush) (struct file *, fl_owner_t id); |
1710 | int (*release) (struct inode *, struct file *); | 1710 | int (*release) (struct inode *, struct file *); |
1711 | int (*fsync) (struct file *, loff_t, loff_t, int datasync); | 1711 | int (*fsync) (struct file *, loff_t, loff_t, int datasync); |
1712 | int (*aio_fsync) (struct kiocb *, int datasync); | ||
1713 | int (*fasync) (int, struct file *, int); | 1712 | int (*fasync) (int, struct file *, int); |
1714 | int (*lock) (struct file *, int, struct file_lock *); | 1713 | int (*lock) (struct file *, int, struct file_lock *); |
1715 | ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); | 1714 | ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); |