Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbd329f1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: add struct xfs_mount pointer to struct xfs_buf 



We need to derive the mount pointer from a buffer in a lot of place.
Add a direct pointer to short cut the pointer chasing.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 8124b9b6

Documentation/filesystems/xfs-self-describing-metadata.txt

+4 −4
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void 
xfs_foo_read_verify(

	struct xfs_buf	*bp)

{

       struct xfs_mount *mp = bp->b_target->bt_mount;

       struct xfs_mount *mp = bp->b_mount;



        if ((xfs_sb_version_hascrc(&mp->m_sb) &&

             !xfs_verify_cksum(bp->b_addr, BBTOB(bp->b_length),
@@ -245,7 +245,7 @@ static bool 
xfs_foo_verify(

	struct xfs_buf		*bp)

{

        struct xfs_mount	*mp = bp->b_target->bt_mount;

        struct xfs_mount	*mp = bp->b_mount;

        struct xfs_ondisk_hdr	*hdr = bp->b_addr;



        if (hdr->magic != cpu_to_be32(XFS_FOO_MAGIC))
@@ -272,7 +272,7 @@ static bool 
xfs_foo_verify(

	struct xfs_buf		*bp)

{

        struct xfs_mount	*mp = bp->b_target->bt_mount;

        struct xfs_mount	*mp = bp->b_mount;

        struct xfs_ondisk_hdr	*hdr = bp->b_addr;



        if (hdr->magic == cpu_to_be32(XFS_FOO_CRC_MAGIC)) {
@@ -297,7 +297,7 @@ static void 
xfs_foo_write_verify(

	struct xfs_buf	*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_buf_log_item	*bip = bp->b_fspriv;



	if (!xfs_foo_verify(bp)) {

fs/xfs/libxfs/xfs_alloc.c

+6 −6
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static xfs_failaddr_t 
xfs_agfl_verify(

	struct xfs_buf	*bp)

{

	struct xfs_mount *mp = bp->b_target->bt_mount;

	struct xfs_mount *mp = bp->b_mount;

	struct xfs_agfl	*agfl = XFS_BUF_TO_AGFL(bp);

	int		i;
@@ -596,7 +596,7 @@ static void 
xfs_agfl_read_verify(

	struct xfs_buf	*bp)

{

	struct xfs_mount *mp = bp->b_target->bt_mount;

	struct xfs_mount *mp = bp->b_mount;

	xfs_failaddr_t	fa;



	/*
@@ -621,7 +621,7 @@ static void 
xfs_agfl_write_verify(

	struct xfs_buf	*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_buf_log_item	*bip = bp->b_log_item;

	xfs_failaddr_t		fa;
@@ -2586,7 +2586,7 @@ static xfs_failaddr_t 
xfs_agf_verify(

	struct xfs_buf		*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(bp);



	if (xfs_sb_version_hascrc(&mp->m_sb)) {
@@ -2644,7 +2644,7 @@ static void 
xfs_agf_read_verify(

	struct xfs_buf	*bp)

{

	struct xfs_mount *mp = bp->b_target->bt_mount;

	struct xfs_mount *mp = bp->b_mount;

	xfs_failaddr_t	fa;



	if (xfs_sb_version_hascrc(&mp->m_sb) &&
@@ -2661,7 +2661,7 @@ static void 
xfs_agf_write_verify(

	struct xfs_buf	*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_buf_log_item	*bip = bp->b_log_item;

	xfs_failaddr_t		fa;

fs/xfs/libxfs/xfs_alloc_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static xfs_failaddr_t 
xfs_allocbt_verify(

	struct xfs_buf		*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_btree_block	*block = XFS_BUF_TO_BLOCK(bp);

	struct xfs_perag	*pag = bp->b_pag;

	xfs_failaddr_t		fa;

fs/xfs/libxfs/xfs_attr_leaf.c

+6 −6
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ xfs_attr3_leaf_verify( 
	struct xfs_buf			*bp)

{

	struct xfs_attr3_icleaf_hdr	ichdr;

	struct xfs_mount		*mp = bp->b_target->bt_mount;

	struct xfs_mount		*mp = bp->b_mount;

	struct xfs_attr_leafblock	*leaf = bp->b_addr;

	struct xfs_attr_leaf_entry	*entries;

	uint32_t			end;	/* must be 32bit - see below */
@@ -313,7 +313,7 @@ static void 
xfs_attr3_leaf_write_verify(

	struct xfs_buf	*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_buf_log_item	*bip = bp->b_log_item;

	struct xfs_attr3_leaf_hdr *hdr3 = bp->b_addr;

	xfs_failaddr_t		fa;
@@ -343,7 +343,7 @@ static void 
xfs_attr3_leaf_read_verify(

	struct xfs_buf		*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_mount	*mp = bp->b_mount;

	xfs_failaddr_t		fa;



	if (xfs_sb_version_hascrc(&mp->m_sb) &&
@@ -865,7 +865,7 @@ xfs_attr_shortform_allfit( 
	struct xfs_attr3_icleaf_hdr leafhdr;

	int			bytes;

	int			i;

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_mount	*mp = bp->b_mount;



	leaf = bp->b_addr;

	xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, leaf);
@@ -1525,7 +1525,7 @@ xfs_attr_leaf_order( 
{

	struct xfs_attr3_icleaf_hdr ichdr1;

	struct xfs_attr3_icleaf_hdr ichdr2;

	struct xfs_mount *mp = leaf1_bp->b_target->bt_mount;

	struct xfs_mount *mp = leaf1_bp->b_mount;



	xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &ichdr1, leaf1_bp->b_addr);

	xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &ichdr2, leaf2_bp->b_addr);
@@ -2568,7 +2568,7 @@ xfs_attr_leaf_lasthash( 
{

	struct xfs_attr3_icleaf_hdr ichdr;

	struct xfs_attr_leaf_entry *entries;

	struct xfs_mount *mp = bp->b_target->bt_mount;

	struct xfs_mount *mp = bp->b_mount;



	xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &ichdr, bp->b_addr);

	entries = xfs_attr3_leaf_entryp(bp->b_addr);

fs/xfs/libxfs/xfs_attr_remote.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ __xfs_attr3_rmt_read_verify( 
	bool		check_crc,

	xfs_failaddr_t	*failaddr)

{

	struct xfs_mount *mp = bp->b_target->bt_mount;

	struct xfs_mount *mp = bp->b_mount;

	char		*ptr;

	int		len;

	xfs_daddr_t	bno;
@@ -175,7 +175,7 @@ static void 
xfs_attr3_rmt_write_verify(

	struct xfs_buf	*bp)

{

	struct xfs_mount *mp = bp->b_target->bt_mount;

	struct xfs_mount *mp = bp->b_mount;

	xfs_failaddr_t	fa;

	int		blksize = mp->m_attr_geo->blksize;

	char		*ptr;