summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-02-03 20:31:07 +0100
committerTejun Heo <tj@kernel.org>2014-02-03 21:43:59 +0100
commit0a6be6555302eebb14510fd6b35bb17e8dfa1386 (patch)
tree892a91e3624eaaf7c26833f5f7a6bbc482ed5591
parentcpuset: update MAINTAINERS entry (diff)
downloadlinux-0a6be6555302eebb14510fd6b35bb17e8dfa1386.tar.xz
linux-0a6be6555302eebb14510fd6b35bb17e8dfa1386.zip
nfs: include xattr.h from fs/nfs/nfs3proc.c
fs/nfs/nfs3proc.c is making use of xattr but was getting linux/xattr.h indirectly through linux/cgroup.h, which will soon drop the inclusion of xattr.h. Explicitly include linux/xattr.h from nfs3proc.c so that compilation doesn't fail when linux/cgroup.h drops linux/xattr.h. As the following cgroup changes will depend on these changes, it probably would be easier to route this through cgroup branch. Would that be okay? Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Trond Myklebust <trond.myklebust@primarydata.com> Cc: linux-nfs@vger.kernel.org
-rw-r--r--fs/nfs/nfs3proc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index aa9bc973f36a..a462ef0fb5d6 100644
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -18,6 +18,7 @@
#include <linux/lockd/bind.h>
#include <linux/nfs_mount.h>
#include <linux/freezer.h>
+#include <linux/xattr.h>
#include "iostat.h"
#include "internal.h"