diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-08-19 10:10:47 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-08-19 10:10:47 +1000 |
| commit | 5be203ad115c1d8294e8685253e05fcea0202e04 (patch) | |
| tree | fb30d691376436a934ab117fa8d5ff4a8f5bc508 /fs/xfs/xfs_trans.c | |
| parent | 5461ad99cab98d19f2570c468cdd6c42b6d66795 (diff) | |
| parent | d4a97a04227d5ba91b91888a016e2300861cfbc7 (diff) | |
Merge branch 'xfs-efi-rework' into for-next
Diffstat (limited to 'fs/xfs/xfs_trans.c')
| -rw-r--r-- | fs/xfs/xfs_trans.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 0582a27107d4..a0ab1dae9c31 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -1019,9 +1019,10 @@ xfs_trans_cancel( * chunk we've been working on and get a new transaction to continue. */ int -xfs_trans_roll( +__xfs_trans_roll( struct xfs_trans **tpp, - struct xfs_inode *dp) + struct xfs_inode *dp, + int *committed) { struct xfs_trans *trans; struct xfs_trans_res tres; @@ -1052,6 +1053,7 @@ xfs_trans_roll( if (error) return error; + *committed = 1; trans = *tpp; /* @@ -1074,3 +1076,12 @@ xfs_trans_roll( xfs_trans_ijoin(trans, dp, 0); return 0; } + +int +xfs_trans_roll( + struct xfs_trans **tpp, + struct xfs_inode *dp) +{ + int committed = 0; + return __xfs_trans_roll(tpp, dp, &committed); +} |