From 12e300b033a6bb1352b539226e3884827fa77bb1 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 17 Jan 2012 22:04:24 -0500
Subject: [PATCH] --- yaml --- r: 294395 b: refs/heads/master c:
 1313e6034a73a55d6293dbdc62b8853dd067771a h: refs/heads/master i:   294393:
 3fecd8b58b82efab67b4cfc435d7f451df1111c3   294391:
 224a57a910110af0ed605b10a0a5bbd4417cec6f v: v3

---
 [refs]                         | 2 +-
 trunk/fs/nfs/pagelist.c        | 1 +
 trunk/include/linux/nfs_fs_i.h | 4 ----
 trunk/include/linux/nfs_xdr.h  | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0ff603ab49d4..6671512f1ada 100644
--- 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
index 5668f7c54c41..77a184e2fe47 100644
--- 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
index 861730275ba0..a5c50d97341e 100644
--- 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
index a764cef06b73..f5188e10ea0e 100644
--- 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>
 
 /*