Commit 2eb7550d authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: convert shutdown reasons to unsigned. 



5.18 w/ std=gnu11 compiled with gcc-5 wants flags stored in unsigned
fields to be unsigned.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent b9f3082e

fs/xfs/xfs_fsops.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

fs/xfs/xfs_log.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_log.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_mount.h

+5 −6
Original line number Diff line number Diff line
@@ -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" }, \