xfs: convert AGF log flags to unsigned.

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

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index b52ed339727f0324fe18b2a345f53c958533a536..1ff3fa67d4c967af84cd0d4d4b2efc40e17c68be 100644 (file)
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -2777,7 +2777,7 @@ xfs_alloc_get_freelist(
        xfs_agblock_t           bno;
        __be32                  *agfl_bno;
        int                     error;
-       int                     logflags;
+       uint32_t                logflags;
        struct xfs_mount        *mp = tp->t_mountp;
        struct xfs_perag        *pag;
 
@@ -2830,9 +2830,9 @@ xfs_alloc_get_freelist(
  */
 void
 xfs_alloc_log_agf(
-       xfs_trans_t     *tp,    /* transaction pointer */
-       struct xfs_buf  *bp,    /* buffer for a.g. freelist header */
-       int             fields) /* mask of fields to be logged (XFS_AGF_...) */
+       struct xfs_trans        *tp,
+       struct xfs_buf          *bp,
+       uint32_t                fields)
 {
        int     first;          /* first byte offset */
        int     last;           /* last byte offset */
@@ -2902,7 +2902,7 @@ xfs_alloc_put_freelist(
        struct xfs_perag        *pag;
        __be32                  *blockp;
        int                     error;
-       int                     logflags;
+       uint32_t                logflags;
        __be32                  *agfl_bno;
        int                     startoff;
 

diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
index d4c057b764f905cd52b0fc161ff0d8f37958424d..84ca09b2223fdf46b31d30fb19b19d0fd0c9c850 100644 (file)
--- a/fs/xfs/libxfs/xfs_alloc.h
+++ b/fs/xfs/libxfs/xfs_alloc.h
@@ -121,7 +121,7 @@ void
 xfs_alloc_log_agf(
        struct xfs_trans *tp,   /* transaction pointer */
        struct xfs_buf  *bp,    /* buffer for a.g. freelist header */
-       int             fields);/* mask of fields to be logged (XFS_AGF_...) */
+       uint32_t        fields);/* mask of fields to be logged (XFS_AGF_...) */
 
 /*
  * Interface for inode allocation to force the pag data to be initialized.

diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index d665c04e69dd3fa981b414f6687703d0566e78c4..65e24847841e68886b8bf9f698f9659d681d09bf 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -525,26 +525,26 @@ typedef struct xfs_agf {
 
 #define XFS_AGF_CRC_OFF                offsetof(struct xfs_agf, agf_crc)
 
-#define        XFS_AGF_MAGICNUM        0x00000001
-#define        XFS_AGF_VERSIONNUM      0x00000002
-#define        XFS_AGF_SEQNO           0x00000004
-#define        XFS_AGF_LENGTH          0x00000008
-#define        XFS_AGF_ROOTS           0x00000010
-#define        XFS_AGF_LEVELS          0x00000020
-#define        XFS_AGF_FLFIRST         0x00000040
-#define        XFS_AGF_FLLAST          0x00000080
-#define        XFS_AGF_FLCOUNT         0x00000100
-#define        XFS_AGF_FREEBLKS        0x00000200
-#define        XFS_AGF_LONGEST         0x00000400
-#define        XFS_AGF_BTREEBLKS       0x00000800
-#define        XFS_AGF_UUID            0x00001000
-#define        XFS_AGF_RMAP_BLOCKS     0x00002000
-#define        XFS_AGF_REFCOUNT_BLOCKS 0x00004000
-#define        XFS_AGF_REFCOUNT_ROOT   0x00008000
-#define        XFS_AGF_REFCOUNT_LEVEL  0x00010000
-#define        XFS_AGF_SPARE64         0x00020000
+#define        XFS_AGF_MAGICNUM        (1u << 0)
+#define        XFS_AGF_VERSIONNUM      (1u << 1)
+#define        XFS_AGF_SEQNO           (1u << 2)
+#define        XFS_AGF_LENGTH          (1u << 3)
+#define        XFS_AGF_ROOTS           (1u << 4)
+#define        XFS_AGF_LEVELS          (1u << 5)
+#define        XFS_AGF_FLFIRST         (1u << 6)
+#define        XFS_AGF_FLLAST          (1u << 7)
+#define        XFS_AGF_FLCOUNT         (1u << 8)
+#define        XFS_AGF_FREEBLKS        (1u << 9)
+#define        XFS_AGF_LONGEST         (1u << 10)
+#define        XFS_AGF_BTREEBLKS       (1u << 11)
+#define        XFS_AGF_UUID            (1u << 12)
+#define        XFS_AGF_RMAP_BLOCKS     (1u << 13)
+#define        XFS_AGF_REFCOUNT_BLOCKS (1u << 14)
+#define        XFS_AGF_REFCOUNT_ROOT   (1u << 15)
+#define        XFS_AGF_REFCOUNT_LEVEL  (1u << 16)
+#define        XFS_AGF_SPARE64         (1u << 17)
 #define        XFS_AGF_NUM_BITS        18
-#define        XFS_AGF_ALL_BITS        ((1 << XFS_AGF_NUM_BITS) - 1)
+#define        XFS_AGF_ALL_BITS        ((1u << XFS_AGF_NUM_BITS) - 1)
 
 #define XFS_AGF_FLAGS \
        { XFS_AGF_MAGICNUM,     "MAGICNUM" }, \