xfs: issue log message on user force shutdown
PATCH 1/1 xfs: issue log message on user force shutdown
From: Dave Chinner <[email protected]>
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 Dave Chinner <[email protected]>
--- fs/xfs/xfs_fsops.c | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-)
fs/xfs/xfs_fsops.c +25 -25
@@ -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,27 +492,34 @@ 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" ); +"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) { -xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_LOGERROR , -"Log I/O Error Detected. Shutting down filesystem" ); - }else if (flags &SHUTDOWN_DEVICE_REQ ) { -xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_IOERROR , -"All device paths lost. Shutting down filesystem" ); - }else if (!(flags &SHUTDOWN_REMOTE_REQ )) { -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)" ); + }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 ) { +xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_IOERROR , +"All device paths lost. Shutting down filesystem" ); + }else if (!(flags &SHUTDOWN_REMOTE_REQ )) { +xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_IOERROR , +"I/O Error Detected. Shutting down filesystem" ); } + +xfs_alert (mp, +"Please unmount the filesystem and rectify the problem(s)" ); }/*
Signature · 1 line
2.17.0
Quoted 9 lines · Dave Chinner
From: Dave Chinner <[email protected]>
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.
Quoted 6 lines
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 Dave Chinner <[email protected]>---
Reviewed-by Brian Foster <[email protected]>
Quoted 84 lines
fs/xfs/xfs_fsops.c | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-)fs/xfs/xfs_fsops.c +25
-25@@ -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,27 +492,34 @@ 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" ); +"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) { -xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_LOGERROR , -"Log I/O Error Detected. Shutting down filesystem" ); - }else if (flags &SHUTDOWN_DEVICE_REQ ) { -xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_IOERROR , -"All device paths lost. Shutting down filesystem" ); - }else if (!(flags &SHUTDOWN_REMOTE_REQ )) { -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)" ); + }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 ) { +xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_IOERROR , +"All device paths lost. Shutting down filesystem" ); + }else if (!(flags &SHUTDOWN_REMOTE_REQ )) { +xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_IOERROR , +"I/O Error Detected. Shutting down filesystem" ); } + +xfs_alert (mp, +"Please unmount the filesystem and rectify the problem(s)" ); }/* Signature · 1 line
2.17.0
Quoted 9 lines · Dave Chinner
From: Dave Chinner <[email protected]>
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.
Quoted 5 lines
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 Dave Chinner <[email protected]>
Looks ok,
Reviewed-by Darrick J. Wong <[email protected]>
--D
Quoted 85 lines
--- fs/xfs/xfs_fsops.c | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-)fs/xfs/xfs_fsops.c +25
-25@@ -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,27 +492,34 @@ 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" ); +"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) { -xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_LOGERROR , -"Log I/O Error Detected. Shutting down filesystem" ); - }else if (flags &SHUTDOWN_DEVICE_REQ ) { -xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_IOERROR , -"All device paths lost. Shutting down filesystem" ); - }else if (!(flags &SHUTDOWN_REMOTE_REQ )) { -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)" ); + }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 ) { +xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_IOERROR , +"All device paths lost. Shutting down filesystem" ); + }else if (!(flags &SHUTDOWN_REMOTE_REQ )) { +xfs_alert_tag (mp,XFS_PTAG_SHUTDOWN_IOERROR , +"I/O Error Detected. Shutting down filesystem" ); } + +xfs_alert (mp, +"Please unmount the filesystem and rectify the problem(s)" ); }/* Signature · 1 line
2.17.0