2014-02-03 19:31:13

by Tejun Heo

[permalink] [raw]
Subject: [PATCH] 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 <[email protected]>
Cc: "J. Bruce Fields" <[email protected]>
Cc: [email protected]
---
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"


2014-02-03 19:56:29

by Trond Myklebust

[permalink] [raw]
Subject: Re: [PATCH] nfs: include xattr.h from fs/nfs/nfs3proc.c


On Feb 3, 2014, at 14:31, Tejun Heo <[email protected]> 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 <[email protected]>
> Cc: "J. Bruce Fields" <[email protected]>

EWRONGMAINTAINER? :-)

Acked-by: Trond Myklebust <[email protected]>

> Cc: [email protected]
> ---
> 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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

--
Trond Myklebust
Linux NFS client maintainer


2014-02-03 20:45:04

by Tejun Heo

[permalink] [raw]
Subject: Re: [PATCH] nfs: include xattr.h from fs/nfs/nfs3proc.c

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 <[email protected]>
> Cc: "J. Bruce Fields" <[email protected]>
> Cc: [email protected]

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

Thanks.

--
tejun

2014-02-03 20:43:24

by Tejun Heo

[permalink] [raw]
Subject: Re: [PATCH] nfs: include xattr.h from fs/nfs/nfs3proc.c

On Mon, Feb 03, 2014 at 02:48:13PM -0500, Trond Myklebust wrote:
>
> On Feb 3, 2014, at 14:31, Tejun Heo <[email protected]> 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 <[email protected]>
> > Cc: "J. Bruce Fields" <[email protected]>
>
> EWRONGMAINTAINER… :-)
>
> Acked-by: Trond Myklebust <[email protected]>

Oopsy, thanks! :)

--
tejun