Merge branch 'perf/urgent' into perf/core, to resolve a conflict

[firefly-linux-kernel-4.4.55.git] / fs / jfs / jfs_inode.c

diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
index 6b0f816201a229da76d9667f8aa65bbb61436ea9..cf7936fe2e6823154330c8e11dbe7c30e8c504ff 100644 (file)
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -109,7 +109,9 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        /*
         * Allocate inode to quota.
         */
-       dquot_initialize(inode);
+       rc = dquot_initialize(inode);
+       if (rc)
+               goto fail_drop;
        rc = dquot_alloc_inode(inode);
        if (rc)
                goto fail_drop;