summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Ma <boyu.mt@taobao.com>2012-06-07 19:04:19 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-10 00:33:05 +0900
commit749c8151fdf307fb7527aded025850027d44aadc (patch)
tree398cf868052005ba95ef9e105324d92ef0e4d20b
parent65926f3ad3b38644b74496f2a32161f6f02f1079 (diff)
downloadlwn-749c8151fdf307fb7527aded025850027d44aadc.tar.gz
lwn-749c8151fdf307fb7527aded025850027d44aadc.zip
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 892427d8d351..4cbe1c2c9968 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -120,7 +120,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);