summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Ma <boyu.mt@taobao.com>2012-06-07 19:04:19 -0400
committerBen Hutchings <ben@decadent.org.uk>2012-06-10 14:42:11 +0100
commit11c8b786fffcb89514892ba36fba10bf3d46310b (patch)
tree2992a343e190c386e96bf9e9849682731bdbdff6
parent8de426390253cabdcfc7e46b53d2d56c894d23bf (diff)
ext4: don't set i_flags in EXT4_IOC_SETFLAGS
commit b22b1f178f6799278d3178d894f37facb2085765 upstream. Commit 7990696 uses the ext4_{set,clear}_inode_flags() functions to change the i_flags automatically but fails to remove the error setting of i_flags. So we still have the problem of trashing state flags. Fix this by removing the assignment. Signed-off-by: Tao Ma <boyu.mt@taobao.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--fs/ext4/ioctl.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 1b7bc39cf140..76a6e3bfb8ea 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -121,7 +121,6 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
else
ext4_clear_inode_flag(inode, i);
}
- ei->i_flags = flags;
ext4_set_inode_flags(inode);
inode->i_ctime = ext4_current_time(inode);