diff options
author | Dave Chinner <dchinner@redhat.com> | 2011-01-27 13:23:28 +1100 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2011-01-28 09:05:36 -0600 |
commit | c6f990d1ff8e4e53b12f4175eb7d7ea710c3ca73 (patch) | |
tree | 109e8d588a9a04ef52b97e751450fe0fffa88a23 /fs/xfs/xfs_log_cil.c | |
parent | 5315837daee7ed76c31ef643915f7d76ef8c1aa3 (diff) | |
download | op-kernel-dev-c6f990d1ff8e4e53b12f4175eb7d7ea710c3ca73.zip op-kernel-dev-c6f990d1ff8e4e53b12f4175eb7d7ea710c3ca73.tar.gz |
xfs: handle CIl transaction commit failures correctly
Failure to commit a transaction into the CIL is not handled
correctly. This currently can only happen when racing with a
shutdown and requires an explicit shutdown check, so it rare and can
be avoided. Remove the shutdown check and make the CIL commit a void
function to indicate it will always succeed, thereby removing the
incorrectly handled failure case.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_log_cil.c')
-rw-r--r-- | fs/xfs/xfs_log_cil.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c index c7eac5a..9ca59be 100644 --- a/fs/xfs/xfs_log_cil.c +++ b/fs/xfs/xfs_log_cil.c @@ -625,7 +625,7 @@ out_abort: * background commit, returns without it held once background commits are * allowed again. */ -int +void xfs_log_commit_cil( struct xfs_mount *mp, struct xfs_trans *tp, @@ -640,11 +640,6 @@ xfs_log_commit_cil( if (flags & XFS_TRANS_RELEASE_LOG_RES) log_flags = XFS_LOG_REL_PERM_RESERV; - if (XLOG_FORCED_SHUTDOWN(log)) { - xlog_cil_free_logvec(log_vector); - return XFS_ERROR(EIO); - } - /* * do all the hard work of formatting items (including memory * allocation) outside the CIL context lock. This prevents stalling CIL @@ -704,7 +699,6 @@ xfs_log_commit_cil( */ if (push) xlog_cil_push(log, 0); - return 0; } /* |