Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[karo-tx-linux.git] / fs / ext4 / ioctl.c

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 2779d5f291a40bf89d9a0e42423e913658d66a23..0c21e22acd74f37ec21f61d6d990fad33ce767db 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -589,7 +589,6 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
        case FS_IOC_GETFSMAP:
                return ext4_ioc_getfsmap(sb, (void __user *)arg);
        case EXT4_IOC_GETFLAGS:
-               ext4_get_inode_flags(ei);
                flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
                return put_user(flags, (int __user *) arg);
        case EXT4_IOC_SETFLAGS: {
@@ -977,7 +976,6 @@ resizefs_out:
                struct fsxattr fa;
 
                memset(&fa, 0, sizeof(struct fsxattr));
-               ext4_get_inode_flags(ei);
                fa.fsx_xflags = ext4_iflags_to_xflags(ei->i_flags & EXT4_FL_USER_VISIBLE);
 
                if (ext4_has_feature_project(inode->i_sb)) {