hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Christoph Hellwig 2020-03-20 08:49:19 -07:00 committed by Darrick J. Wong
parent f97a43e436
commit a582f32fad
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/xfs/xfs_log.c
View File

@ -602,24 +602,16 @@ xfs_log_release_iclog(
struct xlog_in_core *iclog) struct xlog_in_core *iclog)
{ {
struct xlog *log = iclog->ic_log; struct xlog *log = iclog->ic_log;
bool sync; bool sync = false;
if (iclog->ic_state == XLOG_STATE_IOERROR)
goto error;
if (atomic_dec_and_lock(&iclog->ic_refcnt, &log->l_icloglock)) { if (atomic_dec_and_lock(&iclog->ic_refcnt, &log->l_icloglock)) {
if (iclog->ic_state == XLOG_STATE_IOERROR) { if (iclog->ic_state != XLOG_STATE_IOERROR)
spin_unlock(&log->l_icloglock); sync = __xlog_state_release_iclog(log, iclog);
goto error;
}
sync = __xlog_state_release_iclog(log, iclog);
spin_unlock(&log->l_icloglock); spin_unlock(&log->l_icloglock);
if (sync)
xlog_sync(log, iclog);
} }
return;
error: if (sync)
xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR); xlog_sync(log, iclog);
} }
/* /*