Re: [patch 3/4] reiserfs: fixup perms when xattrs are disabled

[Stefan Richter <stefanr@s5r6.in-berlin.de>]

Jeff Mahoney wrote:
>  This patch CONFIG_REISERFS_FS_XATTR protection from reiserfs_permission.
> 
>  This is needed to avoid warnings during file deletions and chowns with
>  xattrs disabled.
> 
> Signed-off-by: Jeff Mahoney <jeffm@suse.com>

Al has a minimally edited version in vfs-2.6.git/for-next:

[...]
> +#ifdef CONFIG_REISERFS_FS_XATTR
> +	/*
> +	 * Stat data v1 doesn't support ACLs.
> +	 */
> +	if (get_inode_sd_version(inode) != STAT_DATA_V1)
> +		return generic_permission(inode, mask, reiserfs_check_acl);
> +	else
> +#endif
> +		return generic_permission(inode, mask, NULL);
> +}
> +

The else is omitted, and hence the second return unindented.

Al, did you mean to let Linus pull from your tree once more?
(I have been using a reiserfs root FS with Jeff's four patches for a 
week and all went smoothly.)
-- 
Stefan Richter
-=====-=-=== -=-= -==-=
http://arcgraph.de/sr/