diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:24:41 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:24:41 -0400 |
| commit | c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4 (patch) | |
| tree | 24b4533146ce10bcf4af6fca0971311ece523d58 /fs/xfs/xfs_file.c | |
| parent | NFS: fix BUG() crash in notify_change() with patch to chown_common() (diff) | |
| parent | fs: move struct kiocb to fs.h (diff) | |
| download | linux-dev-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.tar.xz linux-dev-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.zip | |
Merge branch 'iocb' into for-next
Diffstat (limited to 'fs/xfs/xfs_file.c')
| -rw-r--r-- | fs/xfs/xfs_file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index a2e1cb8a568b..f44212fae653 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -38,7 +38,6 @@ #include "xfs_icache.h" #include "xfs_pnfs.h" -#include <linux/aio.h> #include <linux/dcache.h> #include <linux/falloc.h> #include <linux/pagevec.h> |