Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 173c1ae213955a23220d8dee1742c23087d38edd..619bfc1fda8cc0956ba87bfd9e9fa20b41c10cee 100644 (file)
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -721,7 +721,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
        struct ext4_group_desc *gdp = NULL;
        struct ext4_inode_info *ei;
        struct ext4_sb_info *sbi;
-       int ret2, err = 0;
+       int ret2, err;
        struct inode *ret;
        ext4_group_t i;
        ext4_group_t flex_group;
@@ -769,7 +769,9 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
                inode->i_gid = dir->i_gid;
        } else
                inode_init_owner(inode, dir, mode);
-       dquot_initialize(inode);
+       err = dquot_initialize(inode);
+       if (err)
+               goto out;
 
        if (!goal)
                goal = sbi->s_inode_goal;