summaryrefslogtreecommitdiff
path: root/fs/ext4
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:36:19 +0900
commit6ab997e0b5440eee1bc76bb9d83aa86e3966adb2 (patch)
treeb980792fe1f7e9f2709d6f7a1e1ce089490b99a9 /fs/ext4
parentdadce2efa18e448bb42678efdc72a819bceaa9b7 (diff)
downloadlinux-3.10-6ab997e0b5440eee1bc76bb9d83aa86e3966adb2.tar.gz
linux-3.10-6ab997e0b5440eee1bc76bb9d83aa86e3966adb2.tar.bz2
linux-3.10-6ab997e0b5440eee1bc76bb9d83aa86e3966adb2.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>
Diffstat (limited to 'fs/ext4')
-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 e7eade8b6d6..1365903a514 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -123,7 +123,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);