Merge branch 'for-next' into for-linus

[karo-tx-linux.git] / fs / jfs / jfs_inode.c

diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
index dc0e02159ac9e494fc99a33dcfae47ca3f5a4f5f..829921b677651b166c5d788ddff640d14d63944c 100644 (file)
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -116,10 +116,10 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        /*
         * Allocate inode to quota.
         */
-       if (vfs_dq_alloc_inode(inode)) {
-               rc = -EDQUOT;
+       dquot_initialize(inode);
+       rc = dquot_alloc_inode(inode);
+       if (rc)
                goto fail_drop;
-       }
 
        inode->i_mode = mode;
        /* inherit flags from parent */
@@ -162,7 +162,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
        return inode;
 
 fail_drop:
-       vfs_dq_drop(inode);
+       dquot_drop(inode);
        inode->i_flags |= S_NOQUOTA;
 fail_unlock:
        inode->i_nlink = 0;