On Wed, Apr 29, 2020 at 01:21:52PM -0400, Brian Foster wrote:
> Both types control shutdown messaging and neither is used in the
> current codebase.
>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
> Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_fsops.c | 5 +----
> fs/xfs/xfs_mount.h | 2 --
> 2 files changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
> index 3e61d0cc23f8..ef1d5bb88b93 100644
> --- a/fs/xfs/xfs_fsops.c
> +++ b/fs/xfs/xfs_fsops.c
> @@ -504,10 +504,7 @@ xfs_do_force_shutdown(
> } 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)) {
> + } else {
> xfs_alert_tag(mp, XFS_PTAG_SHUTDOWN_IOERROR,
> "I/O Error Detected. Shutting down filesystem");
> }
> diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
> index b2e4598fdf7d..07b5ba7e5fbd 100644
> --- a/fs/xfs/xfs_mount.h
> +++ b/fs/xfs/xfs_mount.h
> @@ -259,8 +259,6 @@ void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname,
> #define SHUTDOWN_LOG_IO_ERROR 0x0002 /* write attempt to the log failed */
> #define SHUTDOWN_FORCE_UMOUNT 0x0004 /* shutdown from a forced unmount */
> #define SHUTDOWN_CORRUPT_INCORE 0x0008 /* corrupt in-memory data structures */
> -#define SHUTDOWN_REMOTE_REQ 0x0010 /* shutdown came from remote cell */
> -#define SHUTDOWN_DEVICE_REQ 0x0020 /* failed all paths to the device */
>
> /*
> * Flags for xfs_mountfs
> --
> 2.21.1
>
