Commit 6178d104 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove dead code from xfs_log_unmount_write 



When the log is shut down all iclogs are in the XLOG_STATE_IOERROR state,
which means that xlog_state_want_sync and xlog_state_release_iclog are
no-ops.  Remove the whole section of code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 550319e9

fs/xfs/xfs_log.c

+3 −32
Original line number Diff line number Diff line
@@ -984,38 +984,9 @@ xfs_log_unmount_write(xfs_mount_t *mp) 
		iclog = iclog->ic_next;

	} while (iclog != first_iclog);

#endif

	if (! (XLOG_FORCED_SHUTDOWN(log))) {

	if (XLOG_FORCED_SHUTDOWN(log))

		return;

	xfs_log_write_unmount_record(mp);

	} else {

		/*

		 * We're already in forced_shutdown mode, couldn't

		 * even attempt to write out the unmount transaction.

		 *

		 * Go through the motions of sync'ing and releasing

		 * the iclog, even though no I/O will actually happen,

		 * we need to wait for other log I/Os that may already

		 * be in progress.  Do this as a separate section of

		 * code so we'll know if we ever get stuck here that

		 * we're in this odd situation of trying to unmount

		 * a file system that went into forced_shutdown as

		 * the result of an unmount..

		 */

		spin_lock(&log->l_icloglock);

		iclog = log->l_iclog;

		atomic_inc(&iclog->ic_refcnt);

		xlog_state_want_sync(log, iclog);

		xlog_state_release_iclog(log, iclog);

		switch (iclog->ic_state) {

		case XLOG_STATE_ACTIVE:

		case XLOG_STATE_DIRTY:

		case XLOG_STATE_IOERROR:

			spin_unlock(&log->l_icloglock);

			break;

		default:

			xlog_wait(&iclog->ic_force_wait, &log->l_icloglock);

			break;

		}

	}

}



/*