projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[cascardo/linux.git]
/
fs
/
gfs2
/
file.c
diff --git
a/fs/gfs2/file.c
b/fs/gfs2/file.c
index
d79c2da
..
acd1676
100644
(file)
--- a/
fs/gfs2/file.c
+++ b/
fs/gfs2/file.c
@@
-25,6
+25,7
@@
#include <asm/uaccess.h>
#include <linux/dlm.h>
#include <linux/dlm_plock.h>
+#include <linux/aio.h>
#include "gfs2.h"
#include "incore.h"