Commit 254133f5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong

xfs: fold __xfs_trans_roll into xfs_trans_roll

No one cares about the low-level helper anymore.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 4c934c7d
...@@ -1034,17 +1034,14 @@ xfs_trans_cancel( ...@@ -1034,17 +1034,14 @@ xfs_trans_cancel(
* chunk we've been working on and get a new transaction to continue. * chunk we've been working on and get a new transaction to continue.
*/ */
int int
__xfs_trans_roll( xfs_trans_roll(
struct xfs_trans **tpp, struct xfs_trans **tpp,
struct xfs_inode *dp, struct xfs_inode *dp)
int *committed)
{ {
struct xfs_trans *trans; struct xfs_trans *trans;
struct xfs_trans_res tres; struct xfs_trans_res tres;
int error; int error;
*committed = 0;
/* /*
* Ensure that the inode is always logged. * Ensure that the inode is always logged.
*/ */
...@@ -1070,7 +1067,6 @@ __xfs_trans_roll( ...@@ -1070,7 +1067,6 @@ __xfs_trans_roll(
if (error) if (error)
return error; return error;
*committed = 1;
trans = *tpp; trans = *tpp;
/* /*
...@@ -1093,12 +1089,3 @@ __xfs_trans_roll( ...@@ -1093,12 +1089,3 @@ __xfs_trans_roll(
xfs_trans_ijoin(trans, dp, 0); xfs_trans_ijoin(trans, dp, 0);
return 0; return 0;
} }
int
xfs_trans_roll(
struct xfs_trans **tpp,
struct xfs_inode *dp)
{
int committed;
return __xfs_trans_roll(tpp, dp, &committed);
}
...@@ -228,7 +228,6 @@ int xfs_trans_free_extent(struct xfs_trans *, ...@@ -228,7 +228,6 @@ int xfs_trans_free_extent(struct xfs_trans *,
struct xfs_efd_log_item *, xfs_fsblock_t, struct xfs_efd_log_item *, xfs_fsblock_t,
xfs_extlen_t, struct xfs_owner_info *); xfs_extlen_t, struct xfs_owner_info *);
int xfs_trans_commit(struct xfs_trans *); int xfs_trans_commit(struct xfs_trans *);
int __xfs_trans_roll(struct xfs_trans **, struct xfs_inode *, int *);
int xfs_trans_roll(struct xfs_trans **, struct xfs_inode *); int xfs_trans_roll(struct xfs_trans **, struct xfs_inode *);
void xfs_trans_cancel(xfs_trans_t *); void xfs_trans_cancel(xfs_trans_t *);
int xfs_trans_ail_init(struct xfs_mount *); int xfs_trans_ail_init(struct xfs_mount *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment