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/ext4/indirect.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-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.tar.gz linux-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.tar.bz2 linux-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.zip | |
Merge branch 'iocb' into for-next
Diffstat (limited to 'fs/ext4/indirect.c')
| -rw-r--r-- | fs/ext4/indirect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index 45fe924f82bc..740c7871c117 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c @@ -20,9 +20,9 @@ * (sct@redhat.com), 1993, 1998 */ -#include <linux/aio.h> #include "ext4_jbd2.h" #include "truncate.h" +#include <linux/uio.h> #include <trace/events/ext4.h> |