Commit b9f3082e authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: convert quota options flags 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 90215d74

fs/xfs/libxfs/xfs_quota_defs.h

+31 −14
Original line number Diff line number Diff line
@@ -73,29 +73,45 @@ typedef uint8_t xfs_dqtype_t; 
 * to a single function. None of these XFS_QMOPT_* flags are meant to have

 * persistent values (ie. their values can and will change between versions)

 */

#define XFS_QMOPT_UQUOTA	0x0000004 /* user dquot requested */

#define XFS_QMOPT_PQUOTA	0x0000008 /* project dquot requested */

#define XFS_QMOPT_FORCE_RES	0x0000010 /* ignore quota limits */

#define XFS_QMOPT_SBVERSION	0x0000040 /* change superblock version num */

#define XFS_QMOPT_GQUOTA	0x0002000 /* group dquot requested */

#define XFS_QMOPT_UQUOTA	(1u << 0) /* user dquot requested */

#define XFS_QMOPT_GQUOTA	(1u << 1) /* group dquot requested */

#define XFS_QMOPT_PQUOTA	(1u << 2) /* project dquot requested */

#define XFS_QMOPT_FORCE_RES	(1u << 3) /* ignore quota limits */

#define XFS_QMOPT_SBVERSION	(1u << 4) /* change superblock version num */



/*

 * flags to xfs_trans_mod_dquot to indicate which field needs to be

 * modified.

 */

#define XFS_QMOPT_RES_REGBLKS	0x0010000

#define XFS_QMOPT_RES_RTBLKS	0x0020000

#define XFS_QMOPT_BCOUNT	0x0040000

#define XFS_QMOPT_ICOUNT	0x0080000

#define XFS_QMOPT_RTBCOUNT	0x0100000

#define XFS_QMOPT_DELBCOUNT	0x0200000

#define XFS_QMOPT_DELRTBCOUNT	0x0400000

#define XFS_QMOPT_RES_INOS	0x0800000

#define XFS_QMOPT_RES_REGBLKS	(1u << 7)

#define XFS_QMOPT_RES_RTBLKS	(1u << 8)

#define XFS_QMOPT_BCOUNT	(1u << 9)

#define XFS_QMOPT_ICOUNT	(1u << 10)

#define XFS_QMOPT_RTBCOUNT	(1u << 11)

#define XFS_QMOPT_DELBCOUNT	(1u << 12)

#define XFS_QMOPT_DELRTBCOUNT	(1u << 13)

#define XFS_QMOPT_RES_INOS	(1u << 14)



/*

 * flags for dqalloc.

 */

#define XFS_QMOPT_INHERIT	0x1000000

#define XFS_QMOPT_INHERIT	(1u << 31)



#define XFS_QMOPT_FLAGS \

	{ XFS_QMOPT_UQUOTA,		"UQUOTA" }, \

	{ XFS_QMOPT_PQUOTA,		"PQUOTA" }, \

	{ XFS_QMOPT_FORCE_RES,		"FORCE_RES" }, \

	{ XFS_QMOPT_SBVERSION,		"SBVERSION" }, \

	{ XFS_QMOPT_GQUOTA,		"GQUOTA" }, \

	{ XFS_QMOPT_INHERIT,		"INHERIT" }, \

	{ XFS_QMOPT_RES_REGBLKS,	"RES_REGBLKS" }, \

	{ XFS_QMOPT_RES_RTBLKS,		"RES_RTBLKS" }, \

	{ XFS_QMOPT_BCOUNT,		"BCOUNT" }, \

	{ XFS_QMOPT_ICOUNT,		"ICOUNT" }, \

	{ XFS_QMOPT_RTBCOUNT,		"RTBCOUNT" }, \

	{ XFS_QMOPT_DELBCOUNT,		"DELBCOUNT" }, \

	{ XFS_QMOPT_DELRTBCOUNT,	"DELRTBCOUNT" }, \

	{ XFS_QMOPT_RES_INOS,		"RES_INOS" }



/*

 * flags to xfs_trans_mod_dquot.
@@ -114,6 +130,7 @@ typedef uint8_t xfs_dqtype_t; 
		(XFS_QMOPT_UQUOTA | XFS_QMOPT_PQUOTA | XFS_QMOPT_GQUOTA)

#define XFS_QMOPT_RESBLK_MASK	(XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_RES_RTBLKS)





extern xfs_failaddr_t xfs_dquot_verify(struct xfs_mount *mp,

		struct xfs_disk_dquot *ddq, xfs_dqid_t id);

extern xfs_failaddr_t xfs_dqblk_verify(struct xfs_mount *mp,

fs/xfs/xfs_trace.h

+0 −16
Original line number Diff line number Diff line
@@ -1096,22 +1096,6 @@ DEFINE_DQUOT_EVENT(xfs_dqflush_done); 
DEFINE_DQUOT_EVENT(xfs_trans_apply_dquot_deltas_before);

DEFINE_DQUOT_EVENT(xfs_trans_apply_dquot_deltas_after);



#define XFS_QMOPT_FLAGS \

	{ XFS_QMOPT_UQUOTA,		"UQUOTA" }, \

	{ XFS_QMOPT_PQUOTA,		"PQUOTA" }, \

	{ XFS_QMOPT_FORCE_RES,		"FORCE_RES" }, \

	{ XFS_QMOPT_SBVERSION,		"SBVERSION" }, \

	{ XFS_QMOPT_GQUOTA,		"GQUOTA" }, \

	{ XFS_QMOPT_INHERIT,		"INHERIT" }, \

	{ XFS_QMOPT_RES_REGBLKS,	"RES_REGBLKS" }, \

	{ XFS_QMOPT_RES_RTBLKS,		"RES_RTBLKS" }, \

	{ XFS_QMOPT_BCOUNT,		"BCOUNT" }, \

	{ XFS_QMOPT_ICOUNT,		"ICOUNT" }, \

	{ XFS_QMOPT_RTBCOUNT,		"RTBCOUNT" }, \

	{ XFS_QMOPT_DELBCOUNT,		"DELBCOUNT" }, \

	{ XFS_QMOPT_DELRTBCOUNT,	"DELRTBCOUNT" }, \

	{ XFS_QMOPT_RES_INOS,		"RES_INOS" }



TRACE_EVENT(xfs_trans_mod_dquot,

	TP_PROTO(struct xfs_trans *tp, struct xfs_dquot *dqp,

		 unsigned int field, int64_t delta),