Re: [git pull] vfs pile 1.5

[Markus Trippelsdorf]

On 2011.07.26 at 16:52 +0800, Steven Liu wrote:
> 2011/7/26 Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx>:
> > On 2011.07.25 at 21:52 -0700, Linus Torvalds wrote:
> >> On Mon, Jul 25, 2011 at 8:35 PM, Markus Trippelsdorf
> >> <markus@xxxxxxxxxxxxxxx> wrote:
> >> >
> >> > This breaks the build for "# CONFIG_FS_POSIX_ACL is not set" configs:
> >>
> >> Of course it does. And as usual, my exhaustive testing was for the
> >> allyesconfig case, rather than doing both allyesconfig and allnoconfig
> >> like I should.
> >>
> >> Bah.
> >>
> >> Does the attached trivial patch fix everything for you?
> >
> > Yes, thanks.
> >
> > But now xfs fails to build when CONFIG_FS_POSIX_ACL is not set:
> >
> > ÂCC Â Â Âfs/xfs/linux-2.6/xfs_xattr.o
> > fs/xfs/linux-2.6/xfs_iops.c:1025:14: error: âxfs_get_aclâ undeclared here (not in a function)
> 
> maybe some one have not use #ifdef CONFIG_FS_POSIX_ACL
> with  fs/xfs/linux-2.6/xfs_iops.c:1025:14

#ifdefs are ugly. The following fixes the issue for me:

diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
index 2c656ef..39632d9 100644
--- a/fs/xfs/xfs_acl.h
+++ b/fs/xfs/xfs_acl.h
@@ -51,7 +51,10 @@ extern int posix_acl_default_exists(struct inode *inode);
 extern const struct xattr_handler xfs_xattr_acl_access_handler;
 extern const struct xattr_handler xfs_xattr_acl_default_handler;
 #else
-# define xfs_get_acl(inode, type)			NULL
+static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type)
+{
+	return NULL;
+}
 # define xfs_inherit_acl(inode, default_acl)		0
 # define xfs_acl_chmod(inode)				0
 # define posix_acl_access_exists(inode)			0

-- 
Markus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/