summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-03-20 08:49:19 -0700
committerDarrick J. Wong <darrick.wong@oracle.com>2020-03-23 08:27:59 -0700
commita582f32fade215668a00388b4a84ec4577387eac (patch)
tree49ef69c12061f87f8077953dfc278d52201deffb /fs/xfs
parentf97a43e4366277f5b683a130af7f1d86ce7c162b (diff)
downloadlinux-a582f32fade215668a00388b4a84ec4577387eac.tar.bz2
xfs: simplify log shutdown checking in xfs_log_release_iclog
There is no need to check for the ioerror state before the lock, as the shutdown case is not a fast path. Also remove the call to force shutdown the file system, as it must have been shut down already for an iclog to be in the ioerror state. Also clean up the flow of the function a bit. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_log.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 17ba92b115ea..7af9c292540b 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -602,24 +602,16 @@ xfs_log_release_iclog(
struct xlog_in_core *iclog)
{
struct xlog *log = iclog->ic_log;
- bool sync;
-
- if (iclog->ic_state == XLOG_STATE_IOERROR)
- goto error;
+ bool sync = false;
if (atomic_dec_and_lock(&iclog->ic_refcnt, &log->l_icloglock)) {
- if (iclog->ic_state == XLOG_STATE_IOERROR) {
- spin_unlock(&log->l_icloglock);
- goto error;
- }
- sync = __xlog_state_release_iclog(log, iclog);
+ if (iclog->ic_state != XLOG_STATE_IOERROR)
+ sync = __xlog_state_release_iclog(log, iclog);
spin_unlock(&log->l_icloglock);
- if (sync)
- xlog_sync(log, iclog);
}
- return;
-error:
- xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);
+
+ if (sync)
+ xlog_sync(log, iclog);
}
/*