diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 09:19:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 09:19:01 -0800 |
| commit | c5e4ca6da93f69939542385ca23d7ccebddc3f7d (patch) | |
| tree | da01507b6d050f5ac9face51a7be904ed5cc18dd /fs/ntfs | |
| parent | ef091b3cef2d699568b51559ae8340b996f43230 (diff) | |
| parent | e519e7774784f3fa7728657d780863805ed1c983 (diff) | |
| download | linux-c5e4ca6da93f69939542385ca23d7ccebddc3f7d.tar.gz linux-c5e4ca6da93f69939542385ca23d7ccebddc3f7d.tar.bz2 linux-c5e4ca6da93f69939542385ca23d7ccebddc3f7d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull VFS fixes from Al Viro:
"Christoph's and Jan's aio fixes, fixup for generic_file_splice_read
(removal of pointless detritus that actually breaks it when used for
gfs2 ->splice_read()) and fixup for generic_file_read_iter()
interaction with ITER_PIPE destinations."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
splice: remove detritus from generic_file_splice_read()
mm/filemap: don't allow partially uptodate page for pipes
aio: fix freeze protection of aio writes
fs: remove aio_run_iocb
fs: remove the never implemented aio_fsync file operation
aio: hold an extra file reference over AIO read/write operations
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/dir.c | 2 |
1 files changed, 0 insertions, 2 deletions
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 = { .iterate = ntfs_readdir, /* Read directory contents. */ #ifdef NTFS_RW .fsync = ntfs_dir_fsync, /* Sync a directory to disk. */ - /*.aio_fsync = ,*/ /* Sync all outstanding async - i/o operations on a kiocb. */ #endif /* NTFS_RW */ /*.ioctl = ,*/ /* Perform function on the mounted filesystem. */ |