Commit 23825cd1 authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: mark the record passed into btree init_key functions as const

These functions initialize a key from a record, but they aren't supposed
to modify the record.  Mark it const.
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 159eb69d
...@@ -177,8 +177,8 @@ xfs_allocbt_get_maxrecs( ...@@ -177,8 +177,8 @@ xfs_allocbt_get_maxrecs(
STATIC void STATIC void
xfs_allocbt_init_key_from_rec( xfs_allocbt_init_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
key->alloc.ar_startblock = rec->alloc.ar_startblock; key->alloc.ar_startblock = rec->alloc.ar_startblock;
key->alloc.ar_blockcount = rec->alloc.ar_blockcount; key->alloc.ar_blockcount = rec->alloc.ar_blockcount;
...@@ -186,10 +186,10 @@ xfs_allocbt_init_key_from_rec( ...@@ -186,10 +186,10 @@ xfs_allocbt_init_key_from_rec(
STATIC void STATIC void
xfs_bnobt_init_high_key_from_rec( xfs_bnobt_init_high_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
__u32 x; __u32 x;
x = be32_to_cpu(rec->alloc.ar_startblock); x = be32_to_cpu(rec->alloc.ar_startblock);
x += be32_to_cpu(rec->alloc.ar_blockcount) - 1; x += be32_to_cpu(rec->alloc.ar_blockcount) - 1;
...@@ -199,8 +199,8 @@ xfs_bnobt_init_high_key_from_rec( ...@@ -199,8 +199,8 @@ xfs_bnobt_init_high_key_from_rec(
STATIC void STATIC void
xfs_cntbt_init_high_key_from_rec( xfs_cntbt_init_high_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
key->alloc.ar_blockcount = rec->alloc.ar_blockcount; key->alloc.ar_blockcount = rec->alloc.ar_blockcount;
key->alloc.ar_startblock = 0; key->alloc.ar_startblock = 0;
......
...@@ -78,7 +78,7 @@ xfs_bmbt_disk_get_all( ...@@ -78,7 +78,7 @@ xfs_bmbt_disk_get_all(
*/ */
xfs_filblks_t xfs_filblks_t
xfs_bmbt_disk_get_blockcount( xfs_bmbt_disk_get_blockcount(
xfs_bmbt_rec_t *r) const struct xfs_bmbt_rec *r)
{ {
return (xfs_filblks_t)(be64_to_cpu(r->l1) & xfs_mask64lo(21)); return (xfs_filblks_t)(be64_to_cpu(r->l1) & xfs_mask64lo(21));
} }
...@@ -88,7 +88,7 @@ xfs_bmbt_disk_get_blockcount( ...@@ -88,7 +88,7 @@ xfs_bmbt_disk_get_blockcount(
*/ */
xfs_fileoff_t xfs_fileoff_t
xfs_bmbt_disk_get_startoff( xfs_bmbt_disk_get_startoff(
xfs_bmbt_rec_t *r) const struct xfs_bmbt_rec *r)
{ {
return ((xfs_fileoff_t)be64_to_cpu(r->l0) & return ((xfs_fileoff_t)be64_to_cpu(r->l0) &
xfs_mask64lo(64 - BMBT_EXNTFLAG_BITLEN)) >> 9; xfs_mask64lo(64 - BMBT_EXNTFLAG_BITLEN)) >> 9;
...@@ -352,8 +352,8 @@ xfs_bmbt_get_dmaxrecs( ...@@ -352,8 +352,8 @@ xfs_bmbt_get_dmaxrecs(
STATIC void STATIC void
xfs_bmbt_init_key_from_rec( xfs_bmbt_init_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
key->bmbt.br_startoff = key->bmbt.br_startoff =
cpu_to_be64(xfs_bmbt_disk_get_startoff(&rec->bmbt)); cpu_to_be64(xfs_bmbt_disk_get_startoff(&rec->bmbt));
...@@ -361,8 +361,8 @@ xfs_bmbt_init_key_from_rec( ...@@ -361,8 +361,8 @@ xfs_bmbt_init_key_from_rec(
STATIC void STATIC void
xfs_bmbt_init_high_key_from_rec( xfs_bmbt_init_high_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
key->bmbt.br_startoff = cpu_to_be64( key->bmbt.br_startoff = cpu_to_be64(
xfs_bmbt_disk_get_startoff(&rec->bmbt) + xfs_bmbt_disk_get_startoff(&rec->bmbt) +
......
...@@ -88,8 +88,8 @@ extern void xfs_bmdr_to_bmbt(struct xfs_inode *, xfs_bmdr_block_t *, int, ...@@ -88,8 +88,8 @@ extern void xfs_bmdr_to_bmbt(struct xfs_inode *, xfs_bmdr_block_t *, int,
struct xfs_btree_block *, int); struct xfs_btree_block *, int);
void xfs_bmbt_disk_set_all(struct xfs_bmbt_rec *r, struct xfs_bmbt_irec *s); 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(xfs_bmbt_rec_t *r); extern xfs_filblks_t xfs_bmbt_disk_get_blockcount(const struct xfs_bmbt_rec *r);
extern xfs_fileoff_t xfs_bmbt_disk_get_startoff(xfs_bmbt_rec_t *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); extern void xfs_bmbt_disk_get_all(xfs_bmbt_rec_t *r, xfs_bmbt_irec_t *s);
extern void xfs_bmbt_to_bmdr(struct xfs_mount *, struct xfs_btree_block *, int, extern void xfs_bmbt_to_bmdr(struct xfs_mount *, struct xfs_btree_block *, int,
......
...@@ -130,13 +130,13 @@ struct xfs_btree_ops { ...@@ -130,13 +130,13 @@ struct xfs_btree_ops {
/* init values of btree structures */ /* init values of btree structures */
void (*init_key_from_rec)(union xfs_btree_key *key, void (*init_key_from_rec)(union xfs_btree_key *key,
union xfs_btree_rec *rec); const union xfs_btree_rec *rec);
void (*init_rec_from_cur)(struct xfs_btree_cur *cur, void (*init_rec_from_cur)(struct xfs_btree_cur *cur,
union xfs_btree_rec *rec); union xfs_btree_rec *rec);
void (*init_ptr_from_cur)(struct xfs_btree_cur *cur, void (*init_ptr_from_cur)(struct xfs_btree_cur *cur,
union xfs_btree_ptr *ptr); union xfs_btree_ptr *ptr);
void (*init_high_key_from_rec)(union xfs_btree_key *key, void (*init_high_key_from_rec)(union xfs_btree_key *key,
union xfs_btree_rec *rec); const union xfs_btree_rec *rec);
/* difference between key value and cursor value */ /* difference between key value and cursor value */
int64_t (*key_diff)(struct xfs_btree_cur *cur, int64_t (*key_diff)(struct xfs_btree_cur *cur,
......
...@@ -188,18 +188,18 @@ xfs_inobt_get_maxrecs( ...@@ -188,18 +188,18 @@ xfs_inobt_get_maxrecs(
STATIC void STATIC void
xfs_inobt_init_key_from_rec( xfs_inobt_init_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
key->inobt.ir_startino = rec->inobt.ir_startino; key->inobt.ir_startino = rec->inobt.ir_startino;
} }
STATIC void STATIC void
xfs_inobt_init_high_key_from_rec( xfs_inobt_init_high_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
__u32 x; __u32 x;
x = be32_to_cpu(rec->inobt.ir_startino); x = be32_to_cpu(rec->inobt.ir_startino);
x += XFS_INODES_PER_CHUNK - 1; x += XFS_INODES_PER_CHUNK - 1;
......
...@@ -135,18 +135,18 @@ xfs_refcountbt_get_maxrecs( ...@@ -135,18 +135,18 @@ xfs_refcountbt_get_maxrecs(
STATIC void STATIC void
xfs_refcountbt_init_key_from_rec( xfs_refcountbt_init_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
key->refc.rc_startblock = rec->refc.rc_startblock; key->refc.rc_startblock = rec->refc.rc_startblock;
} }
STATIC void STATIC void
xfs_refcountbt_init_high_key_from_rec( xfs_refcountbt_init_high_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
__u32 x; __u32 x;
x = be32_to_cpu(rec->refc.rc_startblock); x = be32_to_cpu(rec->refc.rc_startblock);
x += be32_to_cpu(rec->refc.rc_blockcount) - 1; x += be32_to_cpu(rec->refc.rc_blockcount) - 1;
......
...@@ -156,8 +156,8 @@ xfs_rmapbt_get_maxrecs( ...@@ -156,8 +156,8 @@ xfs_rmapbt_get_maxrecs(
STATIC void STATIC void
xfs_rmapbt_init_key_from_rec( xfs_rmapbt_init_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
key->rmap.rm_startblock = rec->rmap.rm_startblock; key->rmap.rm_startblock = rec->rmap.rm_startblock;
key->rmap.rm_owner = rec->rmap.rm_owner; key->rmap.rm_owner = rec->rmap.rm_owner;
...@@ -173,11 +173,11 @@ xfs_rmapbt_init_key_from_rec( ...@@ -173,11 +173,11 @@ xfs_rmapbt_init_key_from_rec(
*/ */
STATIC void STATIC void
xfs_rmapbt_init_high_key_from_rec( xfs_rmapbt_init_high_key_from_rec(
union xfs_btree_key *key, union xfs_btree_key *key,
union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
uint64_t off; uint64_t off;
int adj; int adj;
adj = be32_to_cpu(rec->rmap.rm_blockcount) - 1; adj = be32_to_cpu(rec->rmap.rm_blockcount) - 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment