Commit a582f32f authored Mar 20, 2020 by Christoph Hellwig Committed by Darrick J. Wong Mar 23, 2020

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>

parent f97a43e4

fs/xfs/xfs_log.c

+6 −14

Original line number	Diff line number	Diff line
		@@ -602,25 +602,17 @@ 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;
		}
		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);
		}

		/*
		* Mount a log filesystem

Admin message