On Tue, 2011-07-26 at 11:15 +0200, Markus Trippelsdorf wrote:
> commit 4e34e719e45, that takes the ACL checks to common code,
> accidentely broke the build when CONFIG_FS_POSIX_ACL is not set:
>
> CC fs/xfs/linux-2.6/xfs_iops.o
> fs/xfs/linux-2.6/xfs_iops.c:1025:14: error: ‘xfs_get_acl’ undeclared here (not in a function)
>
> Fix this by declaring xfs_get_acl a static inline function.
>
> Signed-off-by: Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx>
> ---
> fs/xfs/xfs_acl.h | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> 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
Linus, I have done basic testing of this patch (build,
boot, and some simple XFS tests that touch ACLs) using
your latest master branch (55f9c40). I tested three
combinations:
CONFIG_XFS_POSIX_ACL (and CONFIG_FS_POSIX_ACL) on
CONFIG_XFS_POSIX_ACL off, CONFIG_FS_POSIX_ACL on
CONFIG_XFS_POSIX_ACL and CONFIG_FS_POSIX_ACL both off
I confirmed the build problem in the last two configs
without this patch, and verified it went away with
the patch applied.
So all is well from my perspective. Please either take
his original patch, or pull from here:
git://oss.sgi.com/xfs/xfs for-linus
Thanks.
Signed-off-by: Alex Elder <aelder@xxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
