diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-12 04:24:41 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-12 04:24:41 +0200 |
commit | c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4 (patch) | |
tree | 24b4533146ce10bcf4af6fca0971311ece523d58 /fs/nilfs2 | |
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-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.tar.xz linux-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.zip |
Merge branch 'iocb' into for-next
Diffstat (limited to 'fs/nilfs2')
-rw-r--r-- | fs/nilfs2/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 8b5969538f39..ab4987bc637f 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -26,7 +26,7 @@ #include <linux/mpage.h> #include <linux/pagemap.h> #include <linux/writeback.h> -#include <linux/aio.h> +#include <linux/uio.h> #include "nilfs.h" #include "btnode.h" #include "segment.h" |