| Message ID | 20200319130650.1141068-1-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xfs: remove unused SHUTDOWN_ flags | expand |
On 3/19/20 8:06 AM, Christoph Hellwig wrote: > Remove two flags to xfs_force_shutdown that aren't used anywhere. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks good. Reviewed-by: Alex Elder <elder@linaro.org> > --- > 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 88ab09ed29e7..847f6f85c4fc 100644 > --- a/fs/xfs/xfs_mount.h > +++ b/fs/xfs/xfs_mount.h > @@ -254,8 +254,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 >
On Thu, Mar 19, 2020 at 02:06:50PM +0100, Christoph Hellwig wrote: > Remove two flags to xfs_force_shutdown that aren't used anywhere. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> > --- > 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 88ab09ed29e7..847f6f85c4fc 100644 > --- a/fs/xfs/xfs_mount.h > +++ b/fs/xfs/xfs_mount.h > @@ -254,8 +254,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.24.1 >
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 88ab09ed29e7..847f6f85c4fc 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -254,8 +254,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
Remove two flags to xfs_force_shutdown that aren't used anywhere. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_fsops.c | 5 +---- fs/xfs/xfs_mount.h | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-)