---

yaml --- r: 294395 b: refs/heads/master c: 1313e60 h: refs/heads/master i: 294393: 3fecd8b 294391: 224a57a v: v3
git-mirror · Jan 31, 2012 · 12e300b · 12e300b
1 parent ec0c2b2
commit 12e300b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12bc372b96b35a2dc9245ec61369028932b82ea8
+refs/heads/master: 1313e6034a73a55d6293dbdc62b8853dd067771a
diff --git a/trunk/fs/nfs/pagelist.c b/trunk/fs/nfs/pagelist.c
@@ -13,6 +13,7 @@
 #include <linux/file.h>
 #include <linux/sched.h>
 #include <linux/sunrpc/clnt.h>
+#include <linux/nfs.h>
 #include <linux/nfs3.h>
 #include <linux/nfs4.h>
 #include <linux/nfs_page.h>

diff --git a/trunk/include/linux/nfs_fs_i.h b/trunk/include/linux/nfs_fs_i.h
@@ -1,10 +1,6 @@
 #ifndef _NFS_FS_I
 #define _NFS_FS_I
 
-#include <asm/types.h>
-#include <linux/list.h>
-#include <linux/nfs.h>
-
 struct nlm_lockowner;
 
 /*

diff --git a/trunk/include/linux/nfs_xdr.h b/trunk/include/linux/nfs_xdr.h
@@ -2,7 +2,6 @@
 #define _LINUX_NFS_XDR_H
 
 #include <linux/nfsacl.h>
-#include <linux/nfs3.h>
 #include <linux/sunrpc/gss_api.h>
 
 /*