Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / fs / ext4 / inode.c

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index ce68a34836668c8cbb58d498a930942b03848d28..e963508ea35ffae472a1cd0800b104fe23fc0b52 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4890,14 +4890,6 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
        brelse(iloc.bh);
        ext4_set_inode_flags(inode);
 
-       if (ei->i_flags & EXT4_EA_INODE_FL) {
-               ext4_xattr_inode_set_class(inode);
-
-               inode_lock(inode);
-               inode->i_flags |= S_NOQUOTA;
-               inode_unlock(inode);
-       }
-
        unlock_new_inode(inode);
        return inode;