Re: [PATCH v7 12/22] ext2: Remove ext2_xip_verify_sb()

[Matthew Wilcox]

On Wed, Apr 09, 2014 at 11:52:54AM +0200, Jan Kara wrote:
> > -	if ((sbi->s_mount_opt ^ old_mount_opt) & EXT2_MOUNT_XIP) {
> > +	if ((sbi->s_mount_opt ^ old_opts.s_mount_opt) & EXT2_MOUNT_XIP) {
> >  		ext2_msg(sb, KERN_WARNING, "warning: refusing change of "
> >  			 "xip flag with busy inodes while remounting");
> > -		sbi->s_mount_opt &= ~EXT2_MOUNT_XIP;
> > -		sbi->s_mount_opt |= old_mount_opt & EXT2_MOUNT_XIP;
> > +		sbi->s_mount_opt ^= EXT2_MOUNT_XIP;
>   Although this is correct, it was easier to see that the previous code is
> correct so I'd prefer if you kept it that way.

Depends how you think about it.  I think of foo ^= bar as 'toggle the
bar bit in foo'.  So I read the code as 'If the mount bit is incorrect,
print an error and toggle the bit'.  I think you're reading the old code
as 'If the new mount bit differs from the old mount bit, make sure the
new mount bit is the same as the old mount bit'.
--
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/