diff mbox

nfs: include xattr.h from fs/nfs/nfs3proc.c

Message ID 20140203193107.GH30250@htj.dyndns.org (mailing list archive)
State New, archived
Headers show

Commit Message

Tejun Heo Feb. 3, 2014, 7:31 p.m. UTC
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>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-nfs@vger.kernel.org
---
 fs/nfs/nfs3proc.c |    1 +
 1 file changed, 1 insertion(+)

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Trond Myklebust Feb. 3, 2014, 7:48 p.m. UTC | #1
On Feb 3, 2014, at 14:31, Tejun Heo <tj@kernel.org> wrote:

> 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>
> Cc: "J. Bruce Fields" <bfields@fieldses.org>

EWRONGMAINTAINER… :-)

Acked-by: Trond Myklebust <trond.myklebust@primarydata.com>

> Cc: linux-nfs@vger.kernel.org
> ---
> fs/nfs/nfs3proc.c |    1 +
> 1 file changed, 1 insertion(+)
> 
> --- 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"
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
Trond Myklebust
Linux NFS client maintainer

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tejun Heo Feb. 3, 2014, 8:43 p.m. UTC | #2
On Mon, Feb 03, 2014 at 02:48:13PM -0500, Trond Myklebust wrote:
> 
> On Feb 3, 2014, at 14:31, Tejun Heo <tj@kernel.org> wrote:
> 
> > 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>
> > Cc: "J. Bruce Fields" <bfields@fieldses.org>
> 
> EWRONGMAINTAINER… :-)
> 
> Acked-by: Trond Myklebust <trond.myklebust@primarydata.com>

Oopsy, thanks! :)
Tejun Heo Feb. 3, 2014, 8:45 p.m. UTC | #3
On Mon, Feb 03, 2014 at 02:31:07PM -0500, Tejun Heo wrote:
> 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>
> Cc: "J. Bruce Fields" <bfields@fieldses.org>
> Cc: linux-nfs@vger.kernel.org

Applied to cgroup/for-3.14-fixes w/ Trond's ack added.

Thanks.
diff mbox

Patch

--- 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"