On Apr 16, 2007 19:05 +0200, Jan Kara wrote:
> attached is a patch that stores inode flags such as S_IMMUTABLE,
> S_APPEND, etc. from i_flags to EXT3_I(inode)->i_flags when inode is
> written to disk. The same thing is done on GETFLAGS ioctl.
> Quota code changes these flags on quota files (to make it harder for
> sysadmin to screw himself) and these changes were not correctly
> propagated into the filesystem (especially, lsattr did not show them and
> users were wondering...).
>
> +/* Propagate flags from i_flags to EXT3_I(inode)->i_flags */
> +void ext3_get_inode_flags(struct inode *inode)
> +{
> + unsigned int flags = inode->i_flags;
> +
> + EXT3_I(inode)->i_flags &= ~(EXT3_SYNC_FL|EXT3_APPEND_FL|
> + EXT3_IMMUTABLE_FL|EXT3_NOATIME_FL|EXT3_DIRSYNC_FL);
> + if (flags & S_SYNC)
> + EXT3_I(inode)->i_flags |= EXT3_SYNC_FL;
> + if (flags & S_APPEND)
> + EXT3_I(inode)->i_flags |= EXT3_APPEND_FL;
> + if (flags & S_IMMUTABLE)
> + EXT3_I(inode)->i_flags |= EXT3_IMMUTABLE_FL;
> + if (flags & S_NOATIME)
> + EXT3_I(inode)->i_flags |= EXT3_NOATIME_FL;
> + if (flags & S_DIRSYNC)
> + EXT3_I(inode)->i_flags |= EXT3_DIRSYNC_FL;
> +}
It probably makes sense to pass "struct ext3_inode_info *ei" to this
function, which is available at both callsites and avoids some pointer
math for each access.
> void ext3_read_inode(struct inode * inode)
> {
> struct ext3_iloc iloc;
> @@ -2736,6 +2755,7 @@ static int ext3_do_update_inode(handle_t
> if (ei->i_state & EXT3_STATE_NEW)
> memset(raw_inode, 0, EXT3_SB(inode->i_sb)->s_inode_size);
>
> + ext3_get_inode_flags(inode);
> raw_inode->i_mode = cpu_to_le16(inode->i_mode);
> if(!(test_opt(inode->i_sb, NO_UID32))) {
> raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
> diff -rupX /home/jack/.kerndiffexclude linux-2.6.21-rc6/fs/ext3/ioctl.c linux-2.6.21-rc6-1-ext3_flags_update/fs/ext3/ioctl.c
> --- linux-2.6.21-rc6/fs/ext3/ioctl.c 2007-02-07 12:03:23.000000000 +0100
> +++ linux-2.6.21-rc6-1-ext3_flags_update/fs/ext3/ioctl.c 2007-04-12 18:22:54.000000000 +0200
> @@ -28,6 +28,7 @@ int ext3_ioctl (struct inode * inode, st
>
> switch (cmd) {
> case EXT3_IOC_GETFLAGS:
> + ext3_get_inode_flags(inode);
> flags = ei->i_flags & EXT3_FL_USER_VISIBLE;
> return put_user(flags, (int __user *) arg);
> case EXT3_IOC_SETFLAGS: {
Looks fine otherwise - there is already ext3_set_inode_flags() which sets the
VFS inode flags properly in ext3_read_inode().
Cheers, Andreas
--
Andreas Dilger
Principal Software Engineer
Cluster File Systems, Inc.
-
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
