Commit 9e54ee0f authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong
Browse files

xfs: separate log cleaning from log quiesce 



Log quiesce is currently associated with cleaning the log, which is
accomplished by writing an unmount record as the last step of the
quiesce sequence. The quiesce codepath is a bit convoluted in this
regard due to how it is reused from various contexts. In preparation
to create separate log cleaning and log covering interfaces, lift
the write of the unmount record into a new cleaning helper and call
that wherever xfs_log_quiesce() is currently invoked. No functional
changes.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 37444fc4

fs/xfs/xfs_log.c

+7 −1
Original line number Diff line number Diff line
@@ -957,7 +957,13 @@ xfs_log_quiesce( 
	xfs_buftarg_wait(mp->m_ddev_targp);

	xfs_buf_lock(mp->m_sb_bp);

	xfs_buf_unlock(mp->m_sb_bp);

}



void

xfs_log_clean(

	struct xfs_mount	*mp)

{

	xfs_log_quiesce(mp);

	xfs_log_unmount_write(mp);

}
@@ -972,7 +978,7 @@ void 
xfs_log_unmount(

	struct xfs_mount	*mp)

{

	xfs_log_quiesce(mp);

	xfs_log_clean(mp);



	xfs_buftarg_drain(mp->m_ddev_targp);

fs/xfs/xfs_log.h

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ bool xfs_log_item_in_current_chkpt(struct xfs_log_item *lip); 


void	xfs_log_work_queue(struct xfs_mount *mp);

void	xfs_log_quiesce(struct xfs_mount *mp);

void	xfs_log_clean(struct xfs_mount *mp);

bool	xfs_log_check_lsn(struct xfs_mount *, xfs_lsn_t);

bool	xfs_log_in_recovery(struct xfs_mount *);

fs/xfs/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ xfs_quiesce_attr( 
	if (error)

		xfs_warn(mp, "xfs_attr_quiesce: failed to log sb changes. "

				"Frozen image may not be consistent.");

	xfs_log_quiesce(mp);

	xfs_log_clean(mp);

}



/*