On 11 Apr 2022 at 06:01, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> 5.18 w/ std=gnu11 compiled with gcc-5 wants flags stored in unsigned
> fields to be unsigned.
>
Looks good.
Reviewed-by: Chandan Babu R <chandan.babu@xxxxxxxxxx>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> ---
> fs/xfs/xfs_fsops.c | 2 +-
> fs/xfs/xfs_log.c | 2 +-
> fs/xfs/xfs_log.h | 2 +-
> fs/xfs/xfs_mount.h | 11 +++++------
> 4 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
> index 68f74549fa22..e4cc6b7cae0f 100644
> --- a/fs/xfs/xfs_fsops.c
> +++ b/fs/xfs/xfs_fsops.c
> @@ -512,7 +512,7 @@ xfs_fs_goingdown(
> void
> xfs_do_force_shutdown(
> struct xfs_mount *mp,
> - int flags,
> + uint32_t flags,
> char *fname,
> int lnnum)
> {
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index 499e15b24215..3c216140a1c4 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -3829,7 +3829,7 @@ xlog_verify_iclog(
> bool
> xlog_force_shutdown(
> struct xlog *log,
> - int shutdown_flags)
> + uint32_t shutdown_flags)
> {
> bool log_error = (shutdown_flags & SHUTDOWN_LOG_IO_ERROR);
>
> diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
> index dc1b77b92fc1..3ecf891f34c4 100644
> --- a/fs/xfs/xfs_log.h
> +++ b/fs/xfs/xfs_log.h
> @@ -140,7 +140,7 @@ void xfs_log_clean(struct xfs_mount *mp);
> bool xfs_log_check_lsn(struct xfs_mount *, xfs_lsn_t);
>
> xfs_lsn_t xlog_grant_push_threshold(struct xlog *log, int need_bytes);
> -bool xlog_force_shutdown(struct xlog *log, int shutdown_flags);
> +bool xlog_force_shutdown(struct xlog *log, uint32_t shutdown_flags);
>
> void xlog_use_incompat_feat(struct xlog *log);
> void xlog_drop_incompat_feat(struct xlog *log);
> diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
> index f6dc19de8322..e5629e7c5aaf 100644
> --- a/fs/xfs/xfs_mount.h
> +++ b/fs/xfs/xfs_mount.h
> @@ -425,16 +425,15 @@ __XFS_IS_OPSTATE(blockgc_enabled, BLOCKGC_ENABLED)
> #define XFS_MAX_IO_LOG 30 /* 1G */
> #define XFS_MIN_IO_LOG PAGE_SHIFT
>
> -#define xfs_is_shutdown(mp) xfs_is_shutdown(mp)
> -void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname,
> +void xfs_do_force_shutdown(struct xfs_mount *mp, uint32_t flags, char *fname,
> int lnnum);
> #define xfs_force_shutdown(m,f) \
> xfs_do_force_shutdown(m, f, __FILE__, __LINE__)
>
> -#define SHUTDOWN_META_IO_ERROR 0x0001 /* write attempt to metadata failed */
> -#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_META_IO_ERROR (1u << 0) /* write attempt to metadata failed */
> +#define SHUTDOWN_LOG_IO_ERROR (1u << 1) /* write attempt to the log failed */
> +#define SHUTDOWN_FORCE_UMOUNT (1u << 2) /* shutdown from a forced unmount */
> +#define SHUTDOWN_CORRUPT_INCORE (1u << 3) /* corrupt in-memory structures */
>
> #define XFS_SHUTDOWN_STRINGS \
> { SHUTDOWN_META_IO_ERROR, "metadata_io" }, \
--
chandan
