Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56668a5c authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: issue log message on user force shutdown 



The kernel only issues a log message that it's been shut down when
the filesystem triggers a shutdown itself. Hence there is no trace
in the log when a shutdown is triggered manually from userspace.
This can make it hard to see sequence of events in the log when
things go wrong, so make sure we always log a message when a
shutdown is run.

While there, clean up the logic flow so we don't have to continually
check if the shutdown trigger was user initiated before logging
shutdown messages.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 38b6238e

fs/xfs/xfs_fsops.c

+25 −25
Original line number Diff line number Diff line
@@ -470,20 +470,13 @@ xfs_fs_goingdown( 
 */

void

xfs_do_force_shutdown(

	xfs_mount_t	*mp,

	struct xfs_mount *mp,

	int		flags,

	char		*fname,

	int		lnnum)

{

	int		logerror;



	logerror = flags & SHUTDOWN_LOG_IO_ERROR;

	bool		logerror = flags & SHUTDOWN_LOG_IO_ERROR;



	if (!(flags & SHUTDOWN_FORCE_UMOUNT)) {

		xfs_notice(mp,

	"%s(0x%x) called from line %d of file %s.  Return address = "PTR_FMT,

			__func__, flags, lnnum, fname, __return_address);

	}

	/*

	 * No need to duplicate efforts.

	 */
@@ -499,13 +492,22 @@ xfs_do_force_shutdown( 
	if (xfs_log_force_umount(mp, logerror))

		return;



	if (flags & SHUTDOWN_FORCE_UMOUNT) {

		xfs_alert(mp,

"User initiated shutdown received. Shutting down filesystem");

		return;

	}



	xfs_notice(mp,

"%s(0x%x) called from line %d of file %s. Return address = "PTR_FMT,

		__func__, flags, lnnum, fname, __return_address);



	if (flags & SHUTDOWN_CORRUPT_INCORE) {

		xfs_alert_tag(mp, XFS_PTAG_SHUTDOWN_CORRUPT,

"Corruption of in-memory data detected.  Shutting down filesystem");

		if (XFS_ERRLEVEL_HIGH <= xfs_error_level)

			xfs_stack_trace();

	} else if (!(flags & SHUTDOWN_FORCE_UMOUNT)) {

		if (logerror) {

	} else if (logerror) {

		xfs_alert_tag(mp, XFS_PTAG_SHUTDOWN_LOGERROR,

			"Log I/O Error Detected. Shutting down filesystem");

	} else if (flags & SHUTDOWN_DEVICE_REQ) {
@@ -515,11 +517,9 @@ xfs_do_force_shutdown( 
		xfs_alert_tag(mp, XFS_PTAG_SHUTDOWN_IOERROR,

			"I/O Error Detected. Shutting down filesystem");

	}

	}

	if (!(flags & SHUTDOWN_FORCE_UMOUNT)) {



	xfs_alert(mp,

	"Please umount the filesystem and rectify the problem(s)");

	}

		"Please unmount the filesystem and rectify the problem(s)");

}



/*