From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Mahoney Subject: Re: [patch 3/4] reiserfs: fixup perms when xattrs are disabled Date: Sun, 17 May 2009 09:59:20 -0400 Message-ID: <4A101838.4070600@suse.com> References: <20090517050200.786752018@suse.com> <20090517050332.303142159@suse.com> <4A0FFA15.6070101@s5r6.in-berlin.de> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4A0FFA15.6070101@s5r6.in-berlin.de> Sender: reiserfs-devel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" To: Stefan Richter Cc: Andrew Morton , Linus Torvalds , LKML , ReiserFS Development List , Al Viro -----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 > > 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-----