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

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

fs/xfs/libxfs/xfs_alloc_btree.c

+7 −7
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ xfs_allocbt_get_maxrecs( 
STATIC void

xfs_allocbt_init_key_from_rec(

	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_blockcount = rec->alloc.ar_blockcount;
@@ -187,7 +187,7 @@ xfs_allocbt_init_key_from_rec( 
STATIC void

xfs_bnobt_init_high_key_from_rec(

	union xfs_btree_key		*key,

	union xfs_btree_rec	*rec)

	const union xfs_btree_rec	*rec)

{

	__u32				x;
@@ -200,7 +200,7 @@ xfs_bnobt_init_high_key_from_rec( 
STATIC void

xfs_cntbt_init_high_key_from_rec(

	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_startblock = 0;

fs/xfs/libxfs/xfs_bmap_btree.c

+6 −6
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ xfs_bmbt_disk_get_all( 
 */

xfs_filblks_t

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));

}
@@ -88,7 +88,7 @@ xfs_bmbt_disk_get_blockcount( 
 */

xfs_fileoff_t

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) &

		 xfs_mask64lo(64 - BMBT_EXNTFLAG_BITLEN)) >> 9;
@@ -353,7 +353,7 @@ xfs_bmbt_get_dmaxrecs( 
STATIC void

xfs_bmbt_init_key_from_rec(

	union xfs_btree_key		*key,

	union xfs_btree_rec	*rec)

	const union xfs_btree_rec	*rec)

{

	key->bmbt.br_startoff =

		cpu_to_be64(xfs_bmbt_disk_get_startoff(&rec->bmbt));
@@ -362,7 +362,7 @@ xfs_bmbt_init_key_from_rec( 
STATIC void

xfs_bmbt_init_high_key_from_rec(

	union xfs_btree_key		*key,

	union xfs_btree_rec	*rec)

	const union xfs_btree_rec	*rec)

{

	key->bmbt.br_startoff = cpu_to_be64(

			xfs_bmbt_disk_get_startoff(&rec->bmbt) +

fs/xfs/libxfs/xfs_bmap_btree.h

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ extern void xfs_bmdr_to_bmbt(struct xfs_inode *, xfs_bmdr_block_t *, int, 
			struct xfs_btree_block *, 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(xfs_bmbt_rec_t *r);

extern xfs_fileoff_t xfs_bmbt_disk_get_startoff(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(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_to_bmdr(struct xfs_mount *, struct xfs_btree_block *, int,

fs/xfs/libxfs/xfs_btree.h

+2 −2
Original line number Diff line number Diff line
@@ -130,13 +130,13 @@ struct xfs_btree_ops { 


	/* init values of btree structures */

	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,

				     union xfs_btree_rec *rec);

	void	(*init_ptr_from_cur)(struct xfs_btree_cur *cur,

				     union xfs_btree_ptr *ptr);

	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 */

	int64_t (*key_diff)(struct xfs_btree_cur *cur,

fs/xfs/libxfs/xfs_ialloc_btree.c

+5 −5
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ xfs_inobt_get_maxrecs( 
STATIC void

xfs_inobt_init_key_from_rec(

	union xfs_btree_key		*key,

	union xfs_btree_rec	*rec)

	const union xfs_btree_rec	*rec)

{

	key->inobt.ir_startino = rec->inobt.ir_startino;

}
@@ -197,7 +197,7 @@ xfs_inobt_init_key_from_rec( 
STATIC void

xfs_inobt_init_high_key_from_rec(

	union xfs_btree_key		*key,

	union xfs_btree_rec	*rec)

	const union xfs_btree_rec	*rec)

{

	__u32				x;