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_fsops.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_fsops.c')
| -rw-r--r-- | fs/xfs/xfs_fsops.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index ca0d3eb44925..b4d75825ae37 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c @@ -198,14 +198,10 @@ xfs_growfs_data_private( return error; } - tp = xfs_trans_alloc(mp, XFS_TRANS_GROWFS); - tp->t_flags |= XFS_TRANS_RESERVE; - error = xfs_trans_reserve(tp, &M_RES(mp)->tr_growdata, - XFS_GROWFS_SPACE_RES(mp), 0); - if (error) { - xfs_trans_cancel(tp); + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_growdata, + XFS_GROWFS_SPACE_RES(mp), 0, XFS_TRANS_RESERVE, &tp); + if (error) return error; - } /* * Write new AG headers to disk. Non-transactional, but written |