xfs: mark the record passed into xchk_btree functions as const

xchk_btree calls a user-supplied function to validate each btree record
that it finds.  Those functions are not supposed to change the record
data, so mark the parameter const.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
index cd8fefc9019f345b11e31529d2630b0cd042f07f..961f0193b058a4659dfcc0e2376a825483882eda 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap_btree.c
+++ b/fs/xfs/libxfs/xfs_bmap_btree.c
@@ -58,7 +58,7 @@ xfs_bmdr_to_bmbt(
 
 void
 xfs_bmbt_disk_get_all(
-       struct xfs_bmbt_rec     *rec,
+       const struct xfs_bmbt_rec *rec,
        struct xfs_bmbt_irec    *irec)
 {
        uint64_t                l0 = get_unaligned_be64(&rec->l0);

diff --git a/fs/xfs/libxfs/xfs_bmap_btree.h b/fs/xfs/libxfs/xfs_bmap_btree.h
index 209ded1eefd10a3396ec1520b1a7d321b060e0dc..eda855123ee2a6db8c77b7f5bd06d7f231f69b8f 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap_btree.h
+++ b/fs/xfs/libxfs/xfs_bmap_btree.h
@@ -90,7 +90,8 @@ extern void xfs_bmdr_to_bmbt(struct xfs_inode *, xfs_bmdr_block_t *, int,
 void xfs_bmbt_disk_set_all(struct xfs_bmbt_rec *r, struct xfs_bmbt_irec *s);
 extern xfs_filblks_t xfs_bmbt_disk_get_blockcount(const struct xfs_bmbt_rec *r);
 extern xfs_fileoff_t xfs_bmbt_disk_get_startoff(const struct xfs_bmbt_rec *r);
-extern void xfs_bmbt_disk_get_all(xfs_bmbt_rec_t *r, xfs_bmbt_irec_t *s);
+void xfs_bmbt_disk_get_all(const struct xfs_bmbt_rec *r,
+               struct xfs_bmbt_irec *s);
 
 extern void xfs_bmbt_to_bmdr(struct xfs_mount *, struct xfs_btree_block *, int,
                        xfs_bmdr_block_t *, int);

diff --git a/fs/xfs/scrub/alloc.c b/fs/xfs/scrub/alloc.c
index d5741980094a9b4fa8313573d0e7629476d7defc..87518e1292f84a16b5f26f10d8a92ef70175992e 100644 (file)
--- a/fs/xfs/scrub/alloc.c
+++ b/fs/xfs/scrub/alloc.c
@@ -91,7 +91,7 @@ xchk_allocbt_xref(
 STATIC int
 xchk_allocbt_rec(
        struct xchk_btree       *bs,
-       union xfs_btree_rec     *rec)
+       const union xfs_btree_rec *rec)
 {
        struct xfs_mount        *mp = bs->cur->bc_mp;
        xfs_agnumber_t          agno = bs->cur->bc_ag.pag->pag_agno;

diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c
index ea701f5ca32bba77e63b173907533c48af3192ba..7f7ac8ca1610dd0f3464db88066edd26aac708cc 100644 (file)
--- a/fs/xfs/scrub/bmap.c
+++ b/fs/xfs/scrub/bmap.c
@@ -383,7 +383,7 @@ xchk_bmap_iextent(
 STATIC int
 xchk_bmapbt_rec(
        struct xchk_btree       *bs,
-       union xfs_btree_rec     *rec)
+       const union xfs_btree_rec *rec)
 {
        struct xfs_bmbt_irec    irec;
        struct xfs_bmbt_irec    iext_irec;

diff --git a/fs/xfs/scrub/btree.h b/fs/xfs/scrub/btree.h
index 5572e475f8eda46ef273e4a3bc16e3b86697a397..b7d2fc01fbf9621574b8879f75b0a7d85989fd67 100644 (file)
--- a/fs/xfs/scrub/btree.h
+++ b/fs/xfs/scrub/btree.h
@@ -26,8 +26,8 @@ void xchk_btree_xref_set_corrupt(struct xfs_scrub *sc,
 
 struct xchk_btree;
 typedef int (*xchk_btree_rec_fn)(
-       struct xchk_btree       *bs,
-       union xfs_btree_rec     *rec);
+       struct xchk_btree               *bs,
+       const union xfs_btree_rec       *rec);
 
 struct xchk_btree {
        /* caller-provided scrub state */

diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c
index 30e568596b790be9b9830141c415aee863df5f24..db42eb0a32f22c01324760abd1fa8fe697e99fad 100644 (file)
--- a/fs/xfs/scrub/ialloc.c
+++ b/fs/xfs/scrub/ialloc.c
@@ -418,7 +418,7 @@ xchk_iallocbt_rec_alignment(
 STATIC int
 xchk_iallocbt_rec(
        struct xchk_btree               *bs,
-       union xfs_btree_rec             *rec)
+       const union xfs_btree_rec       *rec)
 {
        struct xfs_mount                *mp = bs->cur->bc_mp;
        struct xchk_iallocbt            *iabt = bs->private;

diff --git a/fs/xfs/scrub/refcount.c b/fs/xfs/scrub/refcount.c
index c547e5ca320708baa7fb08d2f338775fb86e182a..2744eecdbaf018628e8069c6dcdd1b0fc7e3c069 100644 (file)
--- a/fs/xfs/scrub/refcount.c
+++ b/fs/xfs/scrub/refcount.c
@@ -330,7 +330,7 @@ xchk_refcountbt_xref(
 STATIC int
 xchk_refcountbt_rec(
        struct xchk_btree       *bs,
-       union xfs_btree_rec     *rec)
+       const union xfs_btree_rec *rec)
 {
        struct xfs_mount        *mp = bs->cur->bc_mp;
        xfs_agblock_t           *cow_blocks = bs->private;

diff --git a/fs/xfs/scrub/rmap.c b/fs/xfs/scrub/rmap.c
index fc306573f0ac3b8e41c9f775ea8c1bfad0de4286..8dae0345c7dfcf13f8a088d81989308573fda81d 100644 (file)
--- a/fs/xfs/scrub/rmap.c
+++ b/fs/xfs/scrub/rmap.c
@@ -88,7 +88,7 @@ xchk_rmapbt_xref(
 STATIC int
 xchk_rmapbt_rec(
        struct xchk_btree       *bs,
-       union xfs_btree_rec     *rec)
+       const union xfs_btree_rec *rec)
 {
        struct xfs_mount        *mp = bs->cur->bc_mp;
        struct xfs_rmap_irec    irec;