-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Stefan Richter wrote: > 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@xxxxxxxx> > > 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. Oops, of course. I'd forgotten about that once I thought Al had merged them. - -Jeff - -- Jeff Mahoney SUSE Labs -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkoQGDgACgkQLPWxlyuTD7LQtwCcCPb3UC7sQann3C5j7ZvhGNIK X2QAniRCmLRUazgPunHzzkXVK0XY04QZ =c79O -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
