mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

xfs: clean up xfs_trans_commit logic even more

Browse source 
> +shut_us_down:
> +	shutdown = XFS_FORCED_SHUTDOWN(mp) ? EIO : 0;
> +	if (!(tp->t_flags & XFS_TRANS_DIRTY) || shutdown) {
> +		xfs_trans_unreserve_and_mod_sb(tp);
> +		/*

This whole area in _xfs_trans_commit is still a complete mess.

So while touching this code, unravel this mess as well to make the
whole flow of the function simpler and clearer.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Christoph Hellwig 2010-03-15 12:52:49 +11:00 committed by Alex Elder
parent 0924378a68
commit a3ccd2ca43
1 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
fs/xfs/xfs_trans.c
View file

@ -1020,19 +1020,17 @@ xfs_trans_commit_iclog(
* have already been unlocked as if the commit had succeeded. * have already been unlocked as if the commit had succeeded.
* Do not reference the transaction structure after this call. * Do not reference the transaction structure after this call.
*/ */
/*ARGSUSED*/
int int
_xfs_trans_commit( _xfs_trans_commit(
xfs_trans_t *tp, struct xfs_trans *tp,
uint flags, uint flags,
int *log_flushed) int *log_flushed)
{ {
xfs_mount_t *mp = tp->t_mountp; struct xfs_mount *mp = tp->t_mountp;
xfs_lsn_t commit_lsn = -1; xfs_lsn_t commit_lsn = -1;
int error; int error = 0;
int log_flags = 0; int log_flags = 0;
int sync = tp->t_flags & XFS_TRANS_SYNC; int sync = tp->t_flags & XFS_TRANS_SYNC;
int shutdown;
/* /*
* Determine whether this commit is releasing a permanent * Determine whether this commit is releasing a permanent
@ -1050,30 +1048,14 @@ _xfs_trans_commit(
* Also make sure to return any reserved blocks to * Also make sure to return any reserved blocks to
* the free pool. * the free pool.
*/ */
shut_us_down: if (!(tp->t_flags & XFS_TRANS_DIRTY))
shutdown = XFS_FORCED_SHUTDOWN(mp) ? EIO : 0; goto out_unreserve;
if (!(tp->t_flags & XFS_TRANS_DIRTY) || shutdown) {
xfs_trans_unreserve_and_mod_sb(tp); if (XFS_FORCED_SHUTDOWN(mp)) {
/* error = XFS_ERROR(EIO);
* It is indeed possible for the transaction to be goto out_unreserve;
* not dirty but the dqinfo portion to be. All that
* means is that we have some (non-persistent) quota
* reservations that need to be unreserved.
*/
xfs_trans_unreserve_and_mod_dquots(tp);
if (tp->t_ticket) {
commit_lsn = xfs_log_done(mp, tp->t_ticket,
NULL, log_flags);
if (commit_lsn == -1 && !shutdown)
shutdown = XFS_ERROR(EIO);
}
current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
xfs_trans_free_items(tp, shutdown? XFS_TRANS_ABORT : 0);
xfs_trans_free_busy(tp);
xfs_trans_free(tp);
XFS_STATS_INC(xs_trans_empty);
return (shutdown);
} }
ASSERT(tp->t_ticket != NULL); ASSERT(tp->t_ticket != NULL);
/* /*
@ -1086,7 +1068,8 @@ _xfs_trans_commit(
error = xfs_trans_commit_iclog(mp, tp, &commit_lsn, flags); error = xfs_trans_commit_iclog(mp, tp, &commit_lsn, flags);
if (error == ENOMEM) { if (error == ENOMEM) {
xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR); xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR);
goto shut_us_down; error = XFS_ERROR(EIO);
goto out_unreserve;
} }
/* /*
@ -1103,7 +1086,29 @@ _xfs_trans_commit(
XFS_STATS_INC(xs_trans_async); XFS_STATS_INC(xs_trans_async);
} }
return (error); return error;
out_unreserve:
xfs_trans_unreserve_and_mod_sb(tp);
/*
* It is indeed possible for the transaction to be not dirty but
* the dqinfo portion to be. All that means is that we have some
* (non-persistent) quota reservations that need to be unreserved.
*/
xfs_trans_unreserve_and_mod_dquots(tp);
if (tp->t_ticket) {
commit_lsn = xfs_log_done(mp, tp->t_ticket, NULL, log_flags);
if (commit_lsn == -1 && !error)
error = XFS_ERROR(EIO);
}
current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
xfs_trans_free_items(tp, error ? XFS_TRANS_ABORT : 0);
xfs_trans_free_busy(tp);
xfs_trans_free(tp);
XFS_STATS_INC(xs_trans_empty);
return error;
} }
/* /*