xfs: fold __xfs_trans_roll into xfs_trans_roll (254133f5) · Commits · 戴 / test

fs/xfs/xfs_trans.c

+2 −15

Original line number	Diff line number	Diff line
		@@ -1034,17 +1034,14 @@ 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,
		int *committed)
		struct xfs_inode *dp)
		{
		struct xfs_trans *trans;
		struct xfs_trans_res tres;
		int error;

		*committed = 0;

		/*
		* Ensure that the inode is always logged.
		*/
		@@ -1070,7 +1067,6 @@ __xfs_trans_roll(
		if (error)
		return error;

		*committed = 1;
		trans = *tpp;

		/*
		@@ -1093,12 +1089,3 @@ __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;
		return __xfs_trans_roll(tpp, dp, &committed);
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -228,7 +228,6 @@ int xfs_trans_free_extent(struct xfs_trans *,
		struct xfs_efd_log_item *, xfs_fsblock_t,
		xfs_extlen_t, struct xfs_owner_info *);
		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 );
		void xfs_trans_cancel(xfs_trans_t *);
		int xfs_trans_ail_init(struct xfs_mount *);