diff options
author | Dave Chinner <david@fromorbit.com> | 2016-05-20 10:31:52 +1000 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2016-05-20 10:31:52 +1000 |
commit | d6bd9615abdf89b147eb200ea4f63156af8a279e (patch) | |
tree | c9f1bcd755fe58aa61bcd8f440a6b0350fd80cd4 /fs/xfs/xfs_qm.c | |
parent | 8b7a242e53e20dc3f2a071ff4d3d8dfa063174dd (diff) | |
parent | 710b1e2c2948c1e5d0499def5273ecbc6472342d (diff) | |
download | linux-stable-d6bd9615abdf89b147eb200ea4f63156af8a279e.tar.gz linux-stable-d6bd9615abdf89b147eb200ea4f63156af8a279e.tar.bz2 linux-stable-d6bd9615abdf89b147eb200ea4f63156af8a279e.zip |
Merge branch 'xfs-4.7-trans-type-cleanup' into for-next
Diffstat (limited to 'fs/xfs/xfs_qm.c')
-rw-r--r-- | fs/xfs/xfs_qm.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index be125e1758c1..a60d9e2739d1 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -783,13 +783,10 @@ xfs_qm_qino_alloc( } } - tp = xfs_trans_alloc(mp, XFS_TRANS_QM_QINOCREATE); - error = xfs_trans_reserve(tp, &M_RES(mp)->tr_create, - XFS_QM_QINOCREATE_SPACE_RES(mp), 0); - if (error) { - xfs_trans_cancel(tp); + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_create, + XFS_QM_QINOCREATE_SPACE_RES(mp), 0, 0, &tp); + if (error) return error; - } if (need_alloc) { error = xfs_dir_ialloc(&tp, NULL, S_IFREG, 1, 0, 0, 1, ip, |