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/gfs2 | |
| parent | c1b8940b42bb6487b10f2267a96b486276ce9ff7 (diff) | |
| parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff) | |
Merge branch 'iocb' into for-next
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/aops.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/file.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 4ad4f94edebe..fe6634d25d1d 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/swap.h> | 20 | #include <linux/swap.h> |
| 21 | #include <linux/gfs2_ondisk.h> | 21 | #include <linux/gfs2_ondisk.h> |
| 22 | #include <linux/backing-dev.h> | 22 | #include <linux/backing-dev.h> |
| 23 | #include <linux/aio.h> | 23 | #include <linux/uio.h> |
| 24 | #include <trace/events/writeback.h> | 24 | #include <trace/events/writeback.h> |
| 25 | 25 | ||
| 26 | #include "gfs2.h" | 26 | #include "gfs2.h" |
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 3e32bb8e2d7e..f6fc412b1100 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <asm/uaccess.h> | 25 | #include <asm/uaccess.h> |
| 26 | #include <linux/dlm.h> | 26 | #include <linux/dlm.h> |
| 27 | #include <linux/dlm_plock.h> | 27 | #include <linux/dlm_plock.h> |
| 28 | #include <linux/aio.h> | ||
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | 29 | ||
| 31 | #include "gfs2.h" | 30 | #include "gfs2.h" |