agfl and related cleanups
Hi all,
patch 1 is the interesting one that changes the struct agfl definition so that we avoid warnings from new gcc versions about taking the address of a member of a packed structure. The rest is random cleanups in related areas.
PATCH 1/6 xfs: remove the agfl_bno member from struct xfs_agfl
struct xfs_agfl is a header in front of the AGFL entries that exists for CRC enabled file systems. For not CRC enabled file systems the AGFL is simply a list of agbno. Make the CRC case similar to that by just using the list behind the new header. This indirectly solves a problem with modern gcc versions that warn about taking addresses of packed structures (and we have to pack the AGFL given that gcc rounds up structure sizes). Also replace the helper macro to get from a buffer with an inline function in xfs_alloc.h to make the code easier to read.
--- fs/xfs/libxfs/xfs_ag.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 11 ++++++----- fs/xfs/libxfs/xfs_alloc.h | 9 +++++++++ fs/xfs/libxfs/xfs_format.h | 6 ------ fs/xfs/scrub/agheader_repair.c | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-)
fs/xfs/libxfs/xfs_ag.c +1 -1
@@ -301,7 +301,7 @@ xfs_agflblock_init(uuid_copy (&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid); } - agfl_bno =XFS_BUF_TO_AGFL_BNO (mp, bp); + agfl_bno =xfs_buf_to_agfl_bno (bp);for (bucket =0 ; bucket <xfs_agfl_size (mp); bucket++) agfl_bno[bucket] =cpu_to_be32 (NULLAGBLOCK ); }
fs/xfs/libxfs/xfs_alloc.c +6 -5
@@ -589,6 +589,7 @@ xfs_agfl_verify( {struct xfs_mount *mp = bp->b_mount;struct xfs_agfl *agfl =XFS_BUF_TO_AGFL (bp); +__be32 *agfl_bno =xfs_buf_to_agfl_bno (bp);int i;/*
@@ -614,8 +615,8 @@ xfs_agfl_verify(return __this_address;for (i =0 ; i <xfs_agfl_size (mp); i++) { -if (be32_to_cpu (agfl->agfl_bno[i]) !=NULLAGBLOCK && -be32_to_cpu (agfl->agfl_bno[i]) >= mp->m_sb.sb_agblocks) +if (be32_to_cpu (agfl_bno[i]) !=NULLAGBLOCK && +be32_to_cpu (agfl_bno[i]) >= mp->m_sb.sb_agblocks)return __this_address; }
@@ -2684,7 +2685,7 @@ xfs_alloc_get_freelist(/* * Get the block number and update the data structures. */ - agfl_bno =XFS_BUF_TO_AGFL_BNO (mp, agflbp); + agfl_bno =xfs_buf_to_agfl_bno (agflbp); bno =be32_to_cpu (agfl_bno[be32_to_cpu (agf->agf_flfirst)]);be32_add_cpu (&agf->agf_flfirst,1 );xfs_trans_brelse (tp, agflbp);
@@ -2820,7 +2821,7 @@ xfs_alloc_put_freelist(ASSERT (be32_to_cpu (agf->agf_flcount) <=xfs_agfl_size (mp)); - agfl_bno =XFS_BUF_TO_AGFL_BNO (mp, agflbp); + agfl_bno =xfs_buf_to_agfl_bno (agflbp); blockp = &agfl_bno[be32_to_cpu (agf->agf_fllast)]; *blockp =cpu_to_be32 (bno); startoff = (char *)blockp - (char *)agflbp->b_addr;
@@ -3408,7 +3409,7 @@ xfs_agfl_walk(unsigned int i;int error; - agfl_bno =XFS_BUF_TO_AGFL_BNO (mp, agflbp); + agfl_bno =xfs_buf_to_agfl_bno (agflbp); i =be32_to_cpu (agf->agf_flfirst);/* Nothing to walk in an empty AGFL. */
fs/xfs/libxfs/xfs_alloc.h +9 -0
@@ -236,4 +236,13 @@ typedef int (*xfs_agfl_walk_fn)(struct xfs_mount *mp, xfs_agblock_t bno,int xfs_agfl_walk (struct xfs_mount *mp,struct xfs_agf *agf,struct xfs_buf *agflbp,xfs_agfl_walk_fn walk_fn,void *priv); +static inline __be32 * +xfs_buf_to_agfl_bno ( +struct xfs_buf *bp) +{ +if (xfs_sb_version_hascrc (&bp->b_mount->m_sb)) +return bp->b_addr +sizeof (struct xfs_agfl ); +return bp->b_addr; +} +#endif /* __XFS_ALLOC_H__ */
fs/xfs/libxfs/xfs_format.h +0 -6
@@ -785,18 +785,12 @@ typedef struct xfs_agi {#define XFS_AGFL_BLOCK (mp) XFS_HDR_BLOCK(mp, XFS_AGFL_DADDR(mp))#define XFS_BUF_TO_AGFL (bp) ((xfs_agfl_t *)((bp)->b_addr)) -#define XFS_BUF_TO_AGFL_BNO (mp, bp) \ - (xfs_sb_version_hascrc(&((mp)->m_sb)) ? \ - &(XFS_BUF_TO_AGFL(bp)->agfl_bno[0]) : \ - (__be32 *)(bp)->b_addr) -typedef struct xfs_agfl {__be32 agfl_magicnum;__be32 agfl_seqno;uuid_t agfl_uuid;__be64 agfl_lsn;__be32 agfl_crc; -__be32 agfl_bno[];/* actually xfs_agfl_size(mp) */ } __attribute__((packed))xfs_agfl_t ;#define XFS_AGFL_CRC_OFF offsetof(struct xfs_agfl, agfl_crc)
fs/xfs/scrub/agheader_repair.c +1 -1
@@ -602,7 +602,7 @@ xrep_agfl_init_header(* step. */ fl_off =0 ; - agfl_bno =XFS_BUF_TO_AGFL_BNO (mp, agfl_bp); + agfl_bno =xfs_buf_to_agfl_bno (agfl_bp);for_each_xfs_bitmap_extent (br, n, agfl_extents) { agbno =XFS_FSB_TO_AGBNO (mp, br->start);
Signature · 1 line
2.24.1
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
Quoted 11 lines · Christoph Hellwig
struct
xfs_agflis a header in front of the AGFL entries that exists for CRC enabled file systems. For not CRC enabled file systems the AGFL is simply a list of agbno. Make the CRC case similar to that by just using the list behind the new header. This indirectly solves a problem with modern gcc versions that warn about taking addresses of packed structures (and we have to pack the AGFL given that gcc rounds up structure sizes). Also replace the helper macro to get from a buffer with an inline function inxfs_alloc.hto make the code easier to read.Signed-off-by Christoph Hellwig <[email protected]>
I like it.
Giving it an RVB but are we 100% sure that there won't ever be any padding after the xfs_agfl structure before the bno? I don't understand gcc alignment magic.
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
Quoted 11 lines · Eric Sandeen
Quoted 10 lines · Christoph Hellwig
struct
xfs_agflis a header in front of the AGFL entries that exists for CRC enabled file systems. For not CRC enabled file systems the AGFL is simply a list of agbno. Make the CRC case similar to that by just using the list behind the new header. This indirectly solves a problem with modern gcc versions that warn about taking addresses of packed structures (and we have to pack the AGFL given that gcc rounds up structure sizes). Also replace the helper macro to get from a buffer with an inline function inxfs_alloc.hto make the code easier to read.
Quoted 7 lines
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>I like it.
Giving it an RVB but are we 100% sure that there won't ever be any padding after the
xfs_agflstructure before the bno? I don't understand gcc alignment magic.
That is at least the definition of __attribute__((packed))..
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
In reply to Christoph HellwigQuoted 11 lines · Christoph Hellwig
struct
xfs_agflis a header in front of the AGFL entries that exists for CRC enabled file systems. For not CRC enabled file systems the AGFL is simply a list of agbno. Make the CRC case similar to that by just using the list behind the new header. This indirectly solves a problem with modern gcc versions that warn about taking addresses of packed structures (and we have to pack the AGFL given that gcc rounds up structure sizes). Also replace the helper macro to get from a buffer with an inline function inxfs_alloc.hto make the code easier to read.Signed-off-by Christoph Hellwig <[email protected]>
Any chance we can pick this up for 5.6 to unbreak arm OABI?
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
Quoted 11 lines · Christoph Hellwig
Quoted 10 lines · Christoph Hellwig
struct
xfs_agflis a header in front of the AGFL entries that exists for CRC enabled file systems. For not CRC enabled file systems the AGFL is simply a list of agbno. Make the CRC case similar to that by just using the list behind the new header. This indirectly solves a problem with modern gcc versions that warn about taking addresses of packed structures (and we have to pack the AGFL given that gcc rounds up structure sizes). Also replace the helper macro to get from a buffer with an inline function inxfs_alloc.hto make the code easier to read.
Quoted 3 lines
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>Any chance we can pick this up for 5.6 to unbreak arm OABI?
Yeah, I can do that. Is there a Fixes: tag that goes with this?
Also, will you have a chance to respin the last patch for 5.7?
--D
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
Quoted 5 lines · Darrick J. Wong
Quoted 3 lines
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>Any chance we can pick this up for 5.6 to unbreak arm OABI?
Yeah, I can do that. Is there a Fixes: tag that goes with this?
I'm not sure what to add. I think the problem itself has actually always been around since adding v5 fs support. But the build break was only caused by the addition of the BUILD_BUG_ON.
Quoted 1 line
Also, will you have a chance to respin the last patch for 5.7?
Last patch in this series?
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · Darrick J. Wong
Quoted 3 lines
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>Any chance we can pick this up for 5.6 to unbreak arm OABI?
Yeah, I can do that. Is there a Fixes: tag that goes with this?
I'm not sure what to add. I think the problem itself has actually always been around since adding v5 fs support. But the build break was only caused by the addition of the
BUILD_BUG_ON.
Hmm. That's tricky, since in theory this should go all the way back to the introduction of the v5 format in 3.x, but that's going to require explicit backporting to get past all the reorganization and other things that have happened. We might just have to hand-backport it to the stable kernels seeing how the macro name change will probably cause all sorts of problems with AI backports. :/
Quoted 3 lines
Quoted 1 line
Also, will you have a chance to respin the last patch for 5.7?
Last patch in this series?
Yes. From the discussion of patch 6/6,
"+ __xfs_sb_from_disk(&sb, bp->b_addr, false);
"why not dsb here
"Yes, this should just pass dsb."
--D
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
Quoted 12 lines · Darrick J. Wong
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · Darrick J. Wong
Quoted 3 lines
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>Any chance we can pick this up for 5.6 to unbreak arm OABI?
Yeah, I can do that. Is there a Fixes: tag that goes with this?
I'm not sure what to add. I think the problem itself has actually always been around since adding v5 fs support. But the build break was only caused by the addition of the
BUILD_BUG_ON.
Quoted 6 lines
Hmm. That's tricky, since in theory this should go all the way back to the introduction of the v5 format in 3.x, but that's going to require explicit backporting to get past all the reorganization and other things that have happened. We might just have to hand-backport it to the stable kernels seeing how the macro name change will probably cause all sorts of problems with AI backports. :/
So which fixes tag do you want? Or feel free to just add the one you feel fits best.
Quoted 11 lines
Quoted 3 lines
Quoted 1 line
Also, will you have a chance to respin the last patch for 5.7?
Last patch in this series?
Yes. From the discussion of patch 6/6,
"+
__xfs_sb_from_disk(&sb, bp->b_addr, false);"why not dsb here
"Yes, this should just pass dsb."
Oh. I've actually had the respun branch on my box since a day after that comment. But I think it doesn't make sense until the fix in patch one is in the baseline tree, given how many outstanding patch series we have.
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
In reply to Christoph HellwigQuoted 11 lines · Christoph Hellwig
Quoted 10 lines · Christoph Hellwig
struct
xfs_agflis a header in front of the AGFL entries that exists for CRC enabled file systems. For not CRC enabled file systems the AGFL is simply a list of agbno. Make the CRC case similar to that by just using the list behind the new header. This indirectly solves a problem with modern gcc versions that warn about taking addresses of packed structures (and we have to pack the AGFL given that gcc rounds up structure sizes). Also replace the helper macro to get from a buffer with an inline function inxfs_alloc.hto make the code easier to read.
Quoted 4 lines
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>Any chance we can pick this up for 5.6 to unbreak arm OABI?
What did I miss, where's the report of actual breakage vs. (I thought) harmless GCC complaints?
-Eric
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
Quoted 12 lines · Eric Sandeen
Quoted 11 lines · Christoph Hellwig
Quoted 10 lines · Christoph Hellwig
struct
xfs_agflis a header in front of the AGFL entries that exists for CRC enabled file systems. For not CRC enabled file systems the AGFL is simply a list of agbno. Make the CRC case similar to that by just using the list behind the new header. This indirectly solves a problem with modern gcc versions that warn about taking addresses of packed structures (and we have to pack the AGFL given that gcc rounds up structure sizes). Also replace the helper macro to get from a buffer with an inline function inxfs_alloc.hto make the code easier to read.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>Any chance we can pick this up for 5.6 to unbreak arm OABI?
What did I miss, where's the report of actual breakage vs. (I thought) harmless GCC complaints?
The "harmless" gcc complaint is that the kernel build errors out as soon as XFS is enabled on arm OABI. Which is a good thing, as the file system would not be interoperable with other architectures if it didn't.
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
Quoted 18 lines · Christoph Hellwig
Quoted 17 lines · Eric Sandeen
Quoted 15 lines · Christoph Hellwig
Quoted 11 lines · Christoph Hellwig
struct
xfs_agflis a header in front of the AGFL entries that exists for CRC enabled file systems. For not CRC enabled file systems the AGFL is simply a list of agbno. Make the CRC case similar to that by just using the list behind the new header. This indirectly solves a problem with modern gcc versions that warn about taking addresses of packed structures (and we have to pack the AGFL given that gcc rounds up structure sizes). Also replace the helper macro to get from a buffer with an inline function inxfs_alloc.hto make the code easier to read.Signed-off-by Christoph Hellwig <[email protected]>Any chance we can pick this up for 5.6 to unbreak arm OABI?
Quoted 7 lines
Quoted 2 lines
What did I miss, where's the report of actual breakage vs. (I thought) harmless GCC complaints?
The "harmless" gcc complaint is that the kernel build errors out as soon as XFS is enabled on arm OABI. Which is a good thing, as the file system would not be interoperable with other architectures if it didn't.
Not just on latest GCC?
Ok, I just hadn't seen that reported (but, I miss lots).
And the commit log doesn't mention any actual breakage; it sounds like patch to work around a new gcc warning, not an actual fix for anything real.
-Eric
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
Quoted 6 lines · Eric Sandeen
Quoted 4 lines
The "harmless" gcc complaint is that the kernel build errors out as soon as XFS is enabled on arm OABI. Which is a good thing, as the file system would not be interoperable with other architectures if it didn't.
Not just on latest GCC?
AFAIK all versions of gcc, as that is the intent of BUILD_BUG_ON.
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
Quoted 9 lines · Christoph Hellwig
Quoted 6 lines · Eric Sandeen
Quoted 4 lines
The "harmless" gcc complaint is that the kernel build errors out as soon as XFS is enabled on arm OABI. Which is a good thing, as the file system would not be interoperable with other architectures if it didn't.
Not just on latest GCC?
AFAIK all versions of gcc, as that is the intent of
BUILD_BUG_ON.
Right, makes sense.
So let's please commit a changelog that makes it clear that this fixes an actual alignment problem and build breakage, ok?
Thanks,
-Eric
Re: [PATCH 1/6] xfs: remove the agfl_bno member from struct xfs_agfl
So actually I think I was confused. The BUILD_BUG_ON is what we had before adding the __packed. What we fix here іs just a really silly warning from new gcc, which in fact only happens in xfsprogs as the kernel decided that the warning is so damn stupid that we won't enable it. So no need for urgent treatment or a new commit message, sorry for the noise.
I'll just resend the whole series with the review comments addressed.
PATCH 2/6 xfs: remove the xfs_agfl_t typedef
In reply to Christoph HellwigThere is just a single user left, so remove it.
--- fs/xfs/libxfs/xfs_format.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/xfs/libxfs/xfs_format.h +3 -3
@@ -783,15 +783,15 @@ typedef struct xfs_agi {*/ #define XFS_AGFL_DADDR (mp) ((xfs_daddr_t)(3 << (mp)->m_sectbb_log))#define XFS_AGFL_BLOCK (mp) XFS_HDR_BLOCK(mp, XFS_AGFL_DADDR(mp)) -#define XFS_BUF_TO_AGFL (bp) ((xfs_agfl_t *)((bp)->b_addr)) +#define XFS_BUF_TO_AGFL (bp) ((struct xfs_agfl *)((bp)->b_addr)) -typedef struct xfs_agfl { +struct xfs_agfl {__be32 agfl_magicnum;__be32 agfl_seqno;uuid_t agfl_uuid;__be64 agfl_lsn;__be32 agfl_crc; -} __attribute__((packed))xfs_agfl_t ; +} __attribute__((packed));#define XFS_AGFL_CRC_OFF offsetof(struct xfs_agfl, agfl_crc)
Signature · 1 line
2.24.1
Re: [PATCH 2/6] xfs: remove the xfs_agfl_t typedef
Quoted 3 lines · Christoph Hellwig
There is just a single user left, so remove it.
Signed-off-by Christoph Hellwig <[email protected]>
PATCH 3/6 xfs: remove XFS_BUF_TO_AGFL
In reply to Christoph HellwigJust dereference bp->b_addr directly and make the code a little simpler and more clear.
--- fs/xfs/libxfs/xfs_ag.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 7 ++++--- fs/xfs/libxfs/xfs_format.h | 1 - fs/xfs/scrub/agheader_repair.c | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-)
fs/xfs/libxfs/xfs_ag.c +1 -1
@@ -291,7 +291,7 @@ xfs_agflblock_init(struct xfs_buf *bp, struct aghdr_init_data *id) { - struct xfs_agfl *agfl = XFS_BUF_TO_AGFL(bp); + struct xfs_agfl *agfl = bp->b_addr;__be32 *agfl_bno;int bucket;
fs/xfs/libxfs/xfs_alloc.c +4 -3
@@ -588,7 +588,7 @@ xfs_agfl_verify( struct xfs_buf *bp) {struct xfs_mount *mp = bp->b_mount; -struct xfs_agfl *agfl =XFS_BUF_TO_AGFL (bp); +struct xfs_agfl *agfl = bp->b_addr;__be32 *agfl_bno =xfs_buf_to_agfl_bno (bp);int i;
@@ -620,7 +620,7 @@ xfs_agfl_verify(return __this_address; } -if (!xfs_log_check_lsn (mp,be64_to_cpu (XFS_BUF_TO_AGFL (bp)->agfl_lsn))) +if (!xfs_log_check_lsn (mp,be64_to_cpu (agfl->agfl_lsn)))return __this_address;return NULL ; }
@@ -656,6 +656,7 @@ xfs_agfl_write_verify( {struct xfs_mount *mp = bp->b_mount;struct xfs_buf_log_item *bip = bp->b_log_item; +struct xfs_agfl *agfl = bp->b_addr;xfs_failaddr_t fa;/* no verification of non-crc AGFLs */
@@ -669,7 +670,7 @@ xfs_agfl_write_verify( }if (bip) -XFS_BUF_TO_AGFL (bp)->agfl_lsn =cpu_to_be64 (bip->bli_item.li_lsn); + agfl->agfl_lsn =cpu_to_be64 (bip->bli_item.li_lsn);xfs_buf_update_cksum (bp,XFS_AGFL_CRC_OFF ); }
fs/xfs/libxfs/xfs_format.h +0 -1
@@ -783,7 +783,6 @@ typedef struct xfs_agi {*/ #define XFS_AGFL_DADDR (mp) ((xfs_daddr_t)(3 << (mp)->m_sectbb_log))#define XFS_AGFL_BLOCK (mp) XFS_HDR_BLOCK(mp, XFS_AGFL_DADDR(mp)) -#define XFS_BUF_TO_AGFL (bp) ((struct xfs_agfl *)((bp)->b_addr))struct xfs_agfl {__be32 agfl_magicnum;
fs/xfs/scrub/agheader_repair.c +1 -2
@@ -580,7 +580,7 @@ xrep_agfl_init_header(__be32 *agfl_bno;struct xfs_bitmap_range *br;struct xfs_bitmap_range *n; -struct xfs_agfl *agfl; +struct xfs_agfl *agfl = agfl_bp->b_addr;xfs_agblock_t agbno;unsigned int fl_off;
@@ -590,7 +590,6 @@ xrep_agfl_init_header(* Start rewriting the header by setting the bno[] array to * NULLAGBLOCK, then setting AGFL header fields. */ - agfl =XFS_BUF_TO_AGFL (agfl_bp);memset (agfl,0xFF ,BBTOB (agfl_bp->b_length)); agfl->agfl_magicnum =cpu_to_be32 (XFS_AGFL_MAGIC ); agfl->agfl_seqno =cpu_to_be32 (sc->sa.agno);
Signature · 1 line
2.24.1
Re: [PATCH 3/6] xfs: remove XFS_BUF_TO_AGFL
Quoted 2 lines · Christoph Hellwig
Just dereference
bp->b_addrdirectly and make the code a little simpler and more clear.
Yeah, there was really no need for that.
PATCH 4/6 xfs: remove XFS_BUF_TO_AGI
In reply to Christoph HellwigJust dereference bp->b_addr directly and make the code a little simpler and more clear.
--- fs/xfs/libxfs/xfs_ag.c | 6 +++--- fs/xfs/libxfs/xfs_format.h | 1 - fs/xfs/libxfs/xfs_ialloc.c | 27 +++++++++++++-------------- fs/xfs/libxfs/xfs_ialloc_btree.c | 10 +++++----- fs/xfs/scrub/agheader.c | 4 ++-- fs/xfs/scrub/agheader_repair.c | 8 ++++---- fs/xfs/xfs_inode.c | 6 +++--- fs/xfs/xfs_log_recover.c | 6 +++--- 8 files changed, 33 insertions(+), 35 deletions(-)
fs/xfs/libxfs/xfs_ag.c +3 -3
@@ -312,7 +312,7 @@ xfs_agiblock_init(struct xfs_buf *bp, struct aghdr_init_data *id) { - struct xfs_agi *agi = XFS_BUF_TO_AGI(bp); + struct xfs_agi *agi = bp->b_addr;int bucket; agi->agi_magicnum =cpu_to_be32 (XFS_AGI_MAGIC );
@@ -502,7 +502,7 @@ xfs_ag_extend_space(if (error)return error; - agi =XFS_BUF_TO_AGI (bp); + agi = bp->b_addr;be32_add_cpu (&agi->agi_length, len);ASSERT (id->agno == mp->m_sb.sb_agcount -1 ||be32_to_cpu (agi->agi_length) == mp->m_sb.sb_agblocks);
@@ -569,7 +569,7 @@ xfs_ag_get_geometry(memset (ageo,0 ,sizeof (*ageo)); ageo->ag_number = agno; - agi =XFS_BUF_TO_AGI (agi_bp); + agi = agi_bp->b_addr; ageo->ag_icount =be32_to_cpu (agi->agi_count); ageo->ag_ifree =be32_to_cpu (agi->agi_freecount);
fs/xfs/libxfs/xfs_format.h +0 -1
@@ -775,7 +775,6 @@ typedef struct xfs_agi {/* disk block (xfs_daddr_t) in the AG */ #define XFS_AGI_DADDR (mp) ((xfs_daddr_t)(2 << (mp)->m_sectbb_log))#define XFS_AGI_BLOCK (mp) XFS_HDR_BLOCK(mp, XFS_AGI_DADDR(mp)) -#define XFS_BUF_TO_AGI (bp) ((xfs_agi_t *)((bp)->b_addr))/* * The third a.g. block contains the a.g. freelist, an array
fs/xfs/libxfs/xfs_ialloc.c +13 -14
@@ -177,7 +177,7 @@ xfs_inobt_insert( xfs_btnum_t btnum) {struct xfs_btree_cur *cur; -struct xfs_agi *agi =XFS_BUF_TO_AGI (agbp); +struct xfs_agi *agi = agbp->b_addr;xfs_agnumber_t agno =be32_to_cpu (agi->agi_seqno);xfs_agino_t thisino;int i;
@@ -525,7 +525,7 @@ xfs_inobt_insert_sprec( bool merge) /* merge or replace */ {struct xfs_btree_cur *cur; -struct xfs_agi *agi =XFS_BUF_TO_AGI (agbp); +struct xfs_agi *agi = agbp->b_addr;xfs_agnumber_t agno =be32_to_cpu (agi->agi_seqno);int error;int i;
@@ -658,7 +658,7 @@ xfs_ialloc_ag_alloc(* chunk of inodes. If the filesystem is striped, this will fill * an entire stripe unit with inodes. */ - agi =XFS_BUF_TO_AGI (agbp); + agi = agbp->b_addr; newino =be32_to_cpu (agi->agi_newino); agno =be32_to_cpu (agi->agi_seqno); args.agbno = XFS_AGINO_TO_AGBNO(args.mp, newino) +
@@ -1130,7 +1130,7 @@ xfs_dialloc_ag_inobt( xfs_ino_t *inop) {struct xfs_mount *mp = tp->t_mountp; -struct xfs_agi *agi =XFS_BUF_TO_AGI (agbp); +struct xfs_agi *agi = agbp->b_addr;xfs_agnumber_t agno =be32_to_cpu (agi->agi_seqno);xfs_agnumber_t pagno =XFS_INO_TO_AGNO (mp, parent);xfs_agino_t pagino =XFS_INO_TO_AGINO (mp, parent);
@@ -1583,7 +1583,7 @@ xfs_dialloc_ag( xfs_ino_t *inop) {struct xfs_mount *mp = tp->t_mountp; -struct xfs_agi *agi =XFS_BUF_TO_AGI (agbp); +struct xfs_agi *agi = agbp->b_addr;xfs_agnumber_t agno =be32_to_cpu (agi->agi_seqno);xfs_agnumber_t pagno =XFS_INO_TO_AGNO (mp, parent);xfs_agino_t pagino =XFS_INO_TO_AGINO (mp, parent);
@@ -1943,7 +1943,7 @@ xfs_difree_inobt(struct xfs_icluster *xic, struct xfs_inobt_rec_incore *orec) { - struct xfs_agi *agi = XFS_BUF_TO_AGI(agbp); + struct xfs_agi *agi = agbp->b_addr;xfs_agnumber_t agno =be32_to_cpu (agi->agi_seqno);struct xfs_perag *pag;struct xfs_btree_cur *cur;
@@ -2079,7 +2079,7 @@ xfs_difree_finobt(xfs_agino_t agino, struct xfs_inobt_rec_incore *ibtrec) /* inobt record */ { - struct xfs_agi *agi = XFS_BUF_TO_AGI(agbp); + struct xfs_agi *agi = agbp->b_addr;xfs_agnumber_t agno =be32_to_cpu (agi->agi_seqno);struct xfs_btree_cur *cur;struct xfs_inobt_rec_incore rec;
@@ -2489,9 +2489,8 @@ xfs_ialloc_log_agi( sizeof(xfs_agi_t) };#ifdef DEBUG -xfs_agi_t *agi;/* allocation group header */ +struct xfs_agi *agi = bp->b_addr; - agi =XFS_BUF_TO_AGI (bp);ASSERT (agi->agi_magicnum ==cpu_to_be32 (XFS_AGI_MAGIC ));#endif
@@ -2523,14 +2522,13 @@ xfs_agi_verify( struct xfs_buf *bp) {struct xfs_mount *mp = bp->b_mount; -struct xfs_agi *agi =XFS_BUF_TO_AGI (bp); +struct xfs_agi *agi = bp->b_addr;int i;if (xfs_sb_version_hascrc (&mp->m_sb)) {if (!uuid_equal (&agi->agi_uuid, &mp->m_sb.sb_meta_uuid))return __this_address; -if (!xfs_log_check_lsn (mp, -be64_to_cpu (XFS_BUF_TO_AGI (bp)->agi_lsn))) +if (!xfs_log_check_lsn (mp,be64_to_cpu (agi->agi_lsn)))return __this_address; }
@@ -2593,6 +2591,7 @@ xfs_agi_write_verify( {struct xfs_mount *mp = bp->b_mount;struct xfs_buf_log_item *bip = bp->b_log_item; +struct xfs_agi *agi = bp->b_addr;xfs_failaddr_t fa; fa =xfs_agi_verify (bp);
@@ -2605,7 +2604,7 @@ xfs_agi_write_verify(return ;if (bip) -XFS_BUF_TO_AGI (bp)->agi_lsn =cpu_to_be64 (bip->bli_item.li_lsn); + agi->agi_lsn =cpu_to_be64 (bip->bli_item.li_lsn);xfs_buf_update_cksum (bp,XFS_AGI_CRC_OFF ); }
@@ -2661,7 +2660,7 @@ xfs_ialloc_read_agi(if (error)return error; - agi =XFS_BUF_TO_AGI (*bpp); + agi = (*bpp)->b_addr; pag =xfs_perag_get (mp, agno);if (!pag->pagi_init) { pag->pagi_freecount =be32_to_cpu (agi->agi_freecount);
fs/xfs/libxfs/xfs_ialloc_btree.c +5 -5
@@ -45,7 +45,7 @@ xfs_inobt_set_root( int inc) /* level change */ {struct xfs_buf *agbp = cur->bc_private.a.agbp; -struct xfs_agi *agi =XFS_BUF_TO_AGI (agbp); +struct xfs_agi *agi = agbp->b_addr; agi->agi_root = nptr->s;be32_add_cpu (&agi->agi_level, inc);
@@ -59,7 +59,7 @@ xfs_finobt_set_root( int inc) /* level change */ {struct xfs_buf *agbp = cur->bc_private.a.agbp; -struct xfs_agi *agi =XFS_BUF_TO_AGI (agbp); +struct xfs_agi *agi = agbp->b_addr; agi->agi_free_root = nptr->s;be32_add_cpu (&agi->agi_free_level, inc);
@@ -212,7 +212,7 @@ xfs_inobt_init_ptr_from_cur(struct xfs_btree_cur *cur, union xfs_btree_ptr *ptr) { - struct xfs_agi *agi = XFS_BUF_TO_AGI(cur->bc_private.a.agbp); + struct xfs_agi *agi = cur->bc_private.a.agbp->b_addr;ASSERT (cur->bc_private.a.agno ==be32_to_cpu (agi->agi_seqno));
@@ -224,7 +224,7 @@ xfs_finobt_init_ptr_from_cur(struct xfs_btree_cur *cur, union xfs_btree_ptr *ptr) { - struct xfs_agi *agi = XFS_BUF_TO_AGI(cur->bc_private.a.agbp); + struct xfs_agi *agi = cur->bc_private.a.agbp->b_addr;ASSERT (cur->bc_private.a.agno ==be32_to_cpu (agi->agi_seqno)); ptr->s = agi->agi_free_root;
@@ -410,7 +410,7 @@ xfs_inobt_init_cursor( xfs_agnumber_t agno, /* allocation group number */ xfs_btnum_t btnum) /* ialloc or free ino btree */ { -struct xfs_agi *agi =XFS_BUF_TO_AGI (agbp); +struct xfs_agi *agi = agbp->b_addr;struct xfs_btree_cur *cur; cur =kmem_zone_zalloc (xfs_btree_cur_zone,KM_NOFS );
fs/xfs/scrub/agheader.c +2 -2
@@ -765,7 +765,7 @@ static inline voidxchk_agi_xref_icounts ( struct xfs_scrub *sc) { -struct xfs_agi *agi =XFS_BUF_TO_AGI (sc->sa.agi_bp); +struct xfs_agi *agi = sc->sa.agi_bp->b_addr;xfs_agino_t icount;xfs_agino_t freecount;int error;
@@ -834,7 +834,7 @@ xchk_agi( goto out;xchk_buffer_recheck (sc, sc->sa.agi_bp); - agi =XFS_BUF_TO_AGI (sc->sa.agi_bp); + agi = sc->sa.agi_bp->b_addr;/* Check the AG length */ eoag =be32_to_cpu (agi->agi_length);
fs/xfs/scrub/agheader_repair.c +4 -4
@@ -760,7 +760,7 @@ xrep_agi_init_header(struct xfs_buf *agi_bp, struct xfs_agi *old_agi) { - struct xfs_agi *agi = XFS_BUF_TO_AGI(agi_bp); + struct xfs_agi *agi = agi_bp->b_addr;struct xfs_mount *mp = sc->mp;memcpy (old_agi, agi,sizeof (*old_agi));
@@ -806,7 +806,7 @@ xrep_agi_calc_from_btrees( struct xfs_buf *agi_bp) {struct xfs_btree_cur *cur; -struct xfs_agi *agi =XFS_BUF_TO_AGI (agi_bp); +struct xfs_agi *agi = agi_bp->b_addr;struct xfs_mount *mp = sc->mp;xfs_agino_t count;xfs_agino_t freecount;
@@ -834,7 +834,7 @@ xrep_agi_commit_new( struct xfs_buf *agi_bp) {struct xfs_perag *pag; -struct xfs_agi *agi =XFS_BUF_TO_AGI (agi_bp); +struct xfs_agi *agi = agi_bp->b_addr;/* Trigger inode count recalculation */ xfs_force_summary_recalc (sc->mp);
@@ -891,7 +891,7 @@ xrep_agi(if (error)return error; agi_bp->b_ops = &xfs_agi_buf_ops; - agi =XFS_BUF_TO_AGI (agi_bp); + agi = agi_bp->b_addr;/* Find the AGI btree roots. */ error =xrep_agi_find_btrees (sc, fab);
fs/xfs/xfs_inode.c +3 -3
@@ -2119,7 +2119,7 @@ xfs_iunlink_update_bucket( unsigned int bucket_index, xfs_agino_t new_agino) { -struct xfs_agi *agi =XFS_BUF_TO_AGI (agibp); +struct xfs_agi *agi = agibp->b_addr;xfs_agino_t old_value;int offset;
@@ -2259,7 +2259,7 @@ xfs_iunlink( error =xfs_read_agi (mp, tp, agno, &agibp);if (error)return error; - agi =XFS_BUF_TO_AGI (agibp); + agi = agibp->b_addr;/* * Get the index into the agi hash table for the list this inode will
@@ -2443,7 +2443,7 @@ xfs_iunlink_remove( error =xfs_read_agi (mp, tp, agno, &agibp);if (error)return error; - agi =XFS_BUF_TO_AGI (agibp); + agi = agibp->b_addr;/* * Get the index into the agi hash table for the list this inode will
fs/xfs/xfs_log_recover.c +3 -3
@@ -4947,7 +4947,7 @@ xlog_recover_clear_agi_bucket(if (error) goto out_abort; - agi =XFS_BUF_TO_AGI (agibp); + agi = agibp->b_addr; agi->agi_unlinked[bucket] =cpu_to_be32 (NULLAGINO ); offset = offsetof(xfs_agi_t , agi_unlinked) + (sizeof (xfs_agino_t) * bucket);
@@ -5083,7 +5083,7 @@ xlog_recover_process_iunlinks(* buffer reference though, so that it stays pinned in memory * while we need the buffer. */ - agi =XFS_BUF_TO_AGI (agibp); + agi = agibp->b_addr;xfs_buf_unlock (agibp);for (bucket =0 ; bucket <XFS_AGI_UNLINKED_BUCKETS ; bucket++) {
@@ -5840,7 +5840,7 @@ xlog_recover_check_summary(xfs_alert (mp,"%s agi read failed agno %d error %d" , __func__, agno, error); }else { -struct xfs_agi *agi =XFS_BUF_TO_AGI (agibp); +struct xfs_agi *agi = agibp->b_addr; itotal +=be32_to_cpu (agi->agi_count); ifree +=be32_to_cpu (agi->agi_freecount);
Signature · 1 line
2.24.1
Re: [PATCH 4/6] xfs: remove XFS_BUF_TO_AGI
Quoted 2 lines · Christoph Hellwig
Just dereference
bp->b_addrdirectly and make the code a little simpler and more clear.
This is so much clearer <heart emoji> ;)
PATCH 5/6 xfs: remove XFS_BUF_TO_AGF
In reply to Christoph HellwigJust dereference bp->b_addr directly and make the code a little simpler and more clear.
--- fs/xfs/libxfs/xfs_ag.c | 6 ++-- fs/xfs/libxfs/xfs_alloc.c | 52 +++++++++++++----------------- fs/xfs/libxfs/xfs_alloc_btree.c | 10 +++--- fs/xfs/libxfs/xfs_format.h | 1 - fs/xfs/libxfs/xfs_refcount_btree.c | 12 +++---- fs/xfs/libxfs/xfs_rmap_btree.c | 12 +++---- fs/xfs/scrub/agheader.c | 14 ++++---- fs/xfs/scrub/agheader_repair.c | 14 ++++---- fs/xfs/scrub/repair.c | 8 +++-- fs/xfs/xfs_discard.c | 7 ++-- fs/xfs/xfs_log_recover.c | 4 +-- 11 files changed, 68 insertions(+), 72 deletions(-)
fs/xfs/libxfs/xfs_ag.c +3 -3
@@ -243,7 +243,7 @@ xfs_agfblock_init(struct xfs_buf *bp, struct aghdr_init_data *id) { - struct xfs_agf *agf = XFS_BUF_TO_AGF(bp); + struct xfs_agf *agf = bp->b_addr;xfs_extlen_t tmpsize; agf->agf_magicnum =cpu_to_be32 (XFS_AGF_MAGIC );
@@ -515,7 +515,7 @@ xfs_ag_extend_space(if (error)return error; - agf =XFS_BUF_TO_AGF (bp); + agf = bp->b_addr;be32_add_cpu (&agf->agf_length, len);ASSERT (agf->agf_length == agi->agi_length);xfs_alloc_log_agf (tp, bp,XFS_AGF_LENGTH );
@@ -573,7 +573,7 @@ xfs_ag_get_geometry( ageo->ag_icount =be32_to_cpu (agi->agi_count); ageo->ag_ifree =be32_to_cpu (agi->agi_freecount); - agf =XFS_BUF_TO_AGF (agf_bp); + agf = agf_bp->b_addr; ageo->ag_length =be32_to_cpu (agf->agf_length); freeblks = pag->pagf_freeblks + pag->pagf_flcount +
fs/xfs/libxfs/xfs_alloc.c +23 -29
194 lines not on this page · raw message
fs/xfs/libxfs/xfs_alloc_btree.c +5 -5
@@ -36,7 +36,7 @@ xfs_allocbt_set_root( int inc) {struct xfs_buf *agbp = cur->bc_private.a.agbp; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;xfs_agnumber_t seqno =be32_to_cpu (agf->agf_seqno);int btnum = cur->bc_btnum;struct xfs_perag *pag =xfs_perag_get (cur->bc_mp, seqno);
@@ -87,7 +87,7 @@ xfs_allocbt_free_block( struct xfs_buf *bp) {struct xfs_buf *agbp = cur->bc_private.a.agbp; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;xfs_agblock_t bno;int error;
@@ -113,7 +113,7 @@ xfs_allocbt_update_lastrec( int ptr, int reason) { -struct xfs_agf *agf =XFS_BUF_TO_AGF (cur->bc_private.a.agbp); +struct xfs_agf *agf = cur->bc_private.a.agbp->b_addr;xfs_agnumber_t seqno =be32_to_cpu (agf->agf_seqno);struct xfs_perag *pag;__be32 len;
@@ -226,7 +226,7 @@ xfs_allocbt_init_ptr_from_cur(struct xfs_btree_cur *cur, union xfs_btree_ptr *ptr) { - struct xfs_agf *agf = XFS_BUF_TO_AGF(cur->bc_private.a.agbp); + struct xfs_agf *agf = cur->bc_private.a.agbp->b_addr;ASSERT (cur->bc_private.a.agno ==be32_to_cpu (agf->agf_seqno));
@@ -482,7 +482,7 @@ xfs_allocbt_init_cursor( xfs_agnumber_t agno, /* allocation group number */ xfs_btnum_t btnum) /* btree identifier */ { -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;struct xfs_btree_cur *cur;ASSERT (btnum ==XFS_BTNUM_BNO || btnum ==XFS_BTNUM_CNT );
fs/xfs/libxfs/xfs_format.h +0 -1
@@ -707,7 +707,6 @@ typedef struct xfs_agf {/* disk block (xfs_daddr_t) in the AG */ #define XFS_AGF_DADDR (mp) ((xfs_daddr_t)(1 << (mp)->m_sectbb_log))#define XFS_AGF_BLOCK (mp) XFS_HDR_BLOCK(mp, XFS_AGF_DADDR(mp)) -#define XFS_BUF_TO_AGF (bp) ((xfs_agf_t *)((bp)->b_addr))/* * Size of the unlinked inode hash table in the agi.
fs/xfs/libxfs/xfs_refcount_btree.c +6 -6
@@ -35,7 +35,7 @@ xfs_refcountbt_set_root( int inc) {struct xfs_buf *agbp = cur->bc_private.a.agbp; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;xfs_agnumber_t seqno =be32_to_cpu (agf->agf_seqno);struct xfs_perag *pag =xfs_perag_get (cur->bc_mp, seqno);
@@ -58,7 +58,7 @@ xfs_refcountbt_alloc_block( int *stat) {struct xfs_buf *agbp = cur->bc_private.a.agbp; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;struct xfs_alloc_arg args;/* block allocation args */ int error;/* error return value */
@@ -102,7 +102,7 @@ xfs_refcountbt_free_block( {struct xfs_mount *mp = cur->bc_mp;struct xfs_buf *agbp = cur->bc_private.a.agbp; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;xfs_fsblock_t fsbno =XFS_DADDR_TO_FSB (mp,XFS_BUF_ADDR (bp));int error;
@@ -169,7 +169,7 @@ xfs_refcountbt_init_ptr_from_cur(struct xfs_btree_cur *cur, union xfs_btree_ptr *ptr) { - struct xfs_agf *agf = XFS_BUF_TO_AGF(cur->bc_private.a.agbp); + struct xfs_agf *agf = cur->bc_private.a.agbp->b_addr;ASSERT (cur->bc_private.a.agno ==be32_to_cpu (agf->agf_seqno));
@@ -320,7 +320,7 @@ xfs_refcountbt_init_cursor( struct xfs_buf *agbp, xfs_agnumber_t agno) { -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;struct xfs_btree_cur *cur;ASSERT (agno !=NULLAGNUMBER );
@@ -420,7 +420,7 @@ xfs_refcountbt_calc_reserves(if (error)return error; - agf =XFS_BUF_TO_AGF (agbp); + agf = agbp->b_addr; agblocks =be32_to_cpu (agf->agf_length); tree_len =be32_to_cpu (agf->agf_refcount_blocks);xfs_trans_brelse (tp, agbp);
fs/xfs/libxfs/xfs_rmap_btree.c +6 -6
@@ -61,7 +61,7 @@ xfs_rmapbt_set_root( int inc) {struct xfs_buf *agbp = cur->bc_private.a.agbp; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;xfs_agnumber_t seqno =be32_to_cpu (agf->agf_seqno);int btnum = cur->bc_btnum;struct xfs_perag *pag =xfs_perag_get (cur->bc_mp, seqno);
@@ -84,7 +84,7 @@ xfs_rmapbt_alloc_block( int *stat) {struct xfs_buf *agbp = cur->bc_private.a.agbp; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;int error;xfs_agblock_t bno;
@@ -121,7 +121,7 @@ xfs_rmapbt_free_block( struct xfs_buf *bp) {struct xfs_buf *agbp = cur->bc_private.a.agbp; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;xfs_agblock_t bno;int error;
@@ -215,7 +215,7 @@ xfs_rmapbt_init_ptr_from_cur(struct xfs_btree_cur *cur, union xfs_btree_ptr *ptr) { - struct xfs_agf *agf = XFS_BUF_TO_AGF(cur->bc_private.a.agbp); + struct xfs_agf *agf = cur->bc_private.a.agbp->b_addr;ASSERT (cur->bc_private.a.agno ==be32_to_cpu (agf->agf_seqno));
@@ -458,7 +458,7 @@ xfs_rmapbt_init_cursor( struct xfs_buf *agbp, xfs_agnumber_t agno) { -struct xfs_agf *agf =XFS_BUF_TO_AGF (agbp); +struct xfs_agf *agf = agbp->b_addr;struct xfs_btree_cur *cur; cur =kmem_zone_zalloc (xfs_btree_cur_zone,KM_NOFS );
@@ -569,7 +569,7 @@ xfs_rmapbt_calc_reserves(if (error)return error; - agf =XFS_BUF_TO_AGF (agbp); + agf = agbp->b_addr; agblocks =be32_to_cpu (agf->agf_length); tree_len =be32_to_cpu (agf->agf_rmap_blocks);xfs_trans_brelse (tp, agbp);
fs/xfs/scrub/agheader.c +7 -7
@@ -358,7 +358,7 @@ static inline voidxchk_agf_xref_freeblks ( struct xfs_scrub *sc) { -struct xfs_agf *agf =XFS_BUF_TO_AGF (sc->sa.agf_bp); +struct xfs_agf *agf = sc->sa.agf_bp->b_addr;xfs_extlen_t blocks =0 ;int error;
@@ -378,7 +378,7 @@ static inline voidxchk_agf_xref_cntbt ( struct xfs_scrub *sc) { -struct xfs_agf *agf =XFS_BUF_TO_AGF (sc->sa.agf_bp); +struct xfs_agf *agf = sc->sa.agf_bp->b_addr;xfs_agblock_t agbno;xfs_extlen_t blocks;int have;
@@ -410,7 +410,7 @@ STATIC voidxchk_agf_xref_btreeblks ( struct xfs_scrub *sc) { -struct xfs_agf *agf =XFS_BUF_TO_AGF (sc->sa.agf_bp); +struct xfs_agf *agf = sc->sa.agf_bp->b_addr;struct xfs_mount *mp = sc->mp;xfs_agblock_t blocks;xfs_agblock_t btreeblks;
@@ -456,7 +456,7 @@ static inline voidxchk_agf_xref_refcblks ( struct xfs_scrub *sc) { -struct xfs_agf *agf =XFS_BUF_TO_AGF (sc->sa.agf_bp); +struct xfs_agf *agf = sc->sa.agf_bp->b_addr;xfs_agblock_t blocks;int error;
@@ -525,7 +525,7 @@ xchk_agf( goto out;xchk_buffer_recheck (sc, sc->sa.agf_bp); - agf =XFS_BUF_TO_AGF (sc->sa.agf_bp); + agf = sc->sa.agf_bp->b_addr;/* Check the AG length */ eoag =be32_to_cpu (agf->agf_length);
@@ -711,7 +711,7 @@ xchk_agfl( goto out;/* Allocate buffer to ensure uniqueness of AGFL entries. */ - agf =XFS_BUF_TO_AGF (sc->sa.agf_bp); + agf = sc->sa.agf_bp->b_addr; agflcount =be32_to_cpu (agf->agf_flcount);if (agflcount >xfs_agfl_size (sc->mp)) {xchk_block_set_corrupt (sc, sc->sa.agf_bp);
@@ -728,7 +728,7 @@ xchk_agfl( }/* Check the blocks in the AGFL. */ - error =xfs_agfl_walk (sc->mp,XFS_BUF_TO_AGF (sc->sa.agf_bp), + error =xfs_agfl_walk (sc->mp, sc->sa.agf_bp->b_addr, sc->sa.agfl_bp, xchk_agfl_block, &sai);if (error == -ECANCELED ) { error =0 ;
fs/xfs/scrub/agheader_repair.c +7 -7
@@ -140,7 +140,7 @@ xrep_agf_find_btrees(struct xrep_find_ag_btree *fab, struct xfs_buf *agfl_bp) { - struct xfs_agf *old_agf = XFS_BUF_TO_AGF(agf_bp); + struct xfs_agf *old_agf = agf_bp->b_addr;int error;/* Go find the root data. */
@@ -181,7 +181,7 @@ xrep_agf_init_header( struct xfs_agf *old_agf) {struct xfs_mount *mp = sc->mp; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agf_bp); +struct xfs_agf *agf = agf_bp->b_addr;memcpy (old_agf, agf,sizeof (*old_agf));memset (agf,0 ,BBTOB (agf_bp->b_length));
@@ -238,7 +238,7 @@ xrep_agf_calc_from_btrees( {struct xrep_agf_allocbt raa = { .sc = sc };struct xfs_btree_cur *cur =NULL ; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agf_bp); +struct xfs_agf *agf = agf_bp->b_addr;struct xfs_mount *mp = sc->mp;xfs_agblock_t btreeblks;xfs_agblock_t blocks;
@@ -302,7 +302,7 @@ xrep_agf_commit_new( struct xfs_buf *agf_bp) {struct xfs_perag *pag; -struct xfs_agf *agf =XFS_BUF_TO_AGF (agf_bp); +struct xfs_agf *agf = agf_bp->b_addr;/* Trigger fdblocks recalculation */ xfs_force_summary_recalc (sc->mp);
@@ -376,7 +376,7 @@ xrep_agf(if (error)return error; agf_bp->b_ops = &xfs_agf_buf_ops; - agf =XFS_BUF_TO_AGF (agf_bp); + agf = agf_bp->b_addr;/* * Load the AGFL so that we can screen out OWN_AG blocks that are on
@@ -395,7 +395,7 @@ xrep_agf(* Spot-check the AGFL blocks; if they're obviously corrupt then * there's nothing we can do but bail out. */ - error =xfs_agfl_walk (sc->mp,XFS_BUF_TO_AGF (agf_bp), agfl_bp, + error =xfs_agfl_walk (sc->mp, agf_bp->b_addr, agfl_bp, xrep_agf_check_agfl_block, sc);if (error)return error;
@@ -550,7 +550,7 @@ xrep_agfl_update_agf( struct xfs_buf *agf_bp, xfs_agblock_t flcount) { -struct xfs_agf *agf =XFS_BUF_TO_AGF (agf_bp); +struct xfs_agf *agf = agf_bp->b_addr;ASSERT (flcount <=xfs_agfl_size (sc->mp));
fs/xfs/scrub/repair.c +5 -3
@@ -208,8 +208,10 @@ xrep_calc_ag_resblks(/* Now grab the block counters from the AGF. */ error =xfs_alloc_read_agf (mp,NULL , sm->sm_agno,0 , &bp);if (!error) { - aglen =be32_to_cpu (XFS_BUF_TO_AGF (bp)->agf_length); - freelen =be32_to_cpu (XFS_BUF_TO_AGF (bp)->agf_freeblks); +struct xfs_agf *agf = bp->b_addr; + + aglen =be32_to_cpu (agf->agf_length); + freelen =be32_to_cpu (agf->agf_freeblks); usedlen = aglen - freelen;xfs_buf_relse (bp); }
@@ -879,7 +881,7 @@ xrep_find_ag_btree_roots( ri.sc = sc; ri.btree_info = btree_info; - ri.agf =XFS_BUF_TO_AGF (agf_bp); + ri.agf = agf_bp->b_addr; ri.agfl_bp = agfl_bp;for (fab = btree_info; fab->buf_ops; fab++) {ASSERT (agfl_bp || fab->rmap_owner !=XFS_RMAP_OWN_AG );
fs/xfs/xfs_discard.c +4 -3
@@ -31,6 +31,7 @@ xfs_trim_extents(struct block_device *bdev = mp->m_ddev_targp->bt_bdev;struct xfs_btree_cur *cur;struct xfs_buf *agbp; +struct xfs_agf *agf;struct xfs_perag *pag;int error;int i;
@@ -47,14 +48,14 @@ xfs_trim_extents( error =xfs_alloc_read_agf (mp,NULL , agno,0 , &agbp);if (error) goto out_put_perag; + agf = agbp->b_addr; cur =xfs_allocbt_init_cursor (mp,NULL , agbp, agno,XFS_BTNUM_CNT );/* * Look up the longest btree in the AGF and start with it. */ - error =xfs_alloc_lookup_ge (cur,0 , -be32_to_cpu (XFS_BUF_TO_AGF (agbp)->agf_longest), &i); + error =xfs_alloc_lookup_ge (cur,0 ,be32_to_cpu (agf->agf_longest), &i);if (error) goto out_del_cursor;
@@ -75,7 +76,7 @@ xfs_trim_extents( error = -EFSCORRUPTED ; goto out_del_cursor; } -ASSERT (flen <=be32_to_cpu (XFS_BUF_TO_AGF (agbp)->agf_longest)); +ASSERT (flen <=be32_to_cpu (agf->agf_longest));/* * use daddr format for all range/len calculations as that is
fs/xfs/xfs_log_recover.c +2 -2
@@ -5809,7 +5809,6 @@ xlog_recover_check_summary( struct xlog *log) {xfs_mount_t *mp; -xfs_agf_t *agfp;xfs_buf_t *agfbp;xfs_buf_t *agibp;xfs_agnumber_t agno;
@@ -5829,7 +5828,8 @@ xlog_recover_check_summary(xfs_alert (mp,"%s agf read failed agno %d error %d" , __func__, agno, error); }else { - agfp =XFS_BUF_TO_AGF (agfbp); +struct xfs_agf *agfp = agfbp->b_addr; + freeblks +=be32_to_cpu (agfp->agf_freeblks) +be32_to_cpu (agfp->agf_flcount);xfs_buf_relse (agfbp);
Signature · 1 line
2.24.1
Re: [PATCH 5/6] xfs: remove XFS_BUF_TO_AGF
Quoted 4 lines · Christoph Hellwig
Just dereference
bp->b_addrdirectly and make the code a little simpler and more clear.Signed-off-by Christoph Hellwig <[email protected]>
...
fs/xfs/libxfs/xfs_alloc.c xfs_alloc_log_agf( · line 2747
Quoted 6 lines
fs/xfs/libxfs/xfs_alloc.c +1
-1@@ -2747,7 +2744,7 @@ xfs_alloc_log_agf( sizeof(xfs_agf_t) }; -trace_xfs_agf (tp->t_mountp,XFS_BUF_TO_AGF (bp), fields, _RET_IP_); +trace_xfs_agf (tp->t_mountp, bp->b_addr, fields, _RET_IP_);
Why is this not passing in agf?
Re: [PATCH 5/6] xfs: remove XFS_BUF_TO_AGF
In reply to Christoph HellwigQuoted 4 lines · Christoph Hellwig
Just dereference
bp->b_addrdirectly and make the code a little simpler and more clear.Signed-off-by Christoph Hellwig <[email protected]>
Sorry ignore my question, lost track of the function we were in.
PATCH 6/6 xfs: remove XFS_BUF_TO_SBP
In reply to Christoph HellwigJust dereference bp->b_addr directly and make the code a little simpler and more clear.
--- fs/xfs/libxfs/xfs_ag.c | 2 +- fs/xfs/libxfs/xfs_format.h | 1 - fs/xfs/libxfs/xfs_sb.c | 17 +++++++++-------- fs/xfs/scrub/agheader.c | 2 +- fs/xfs/scrub/agheader_repair.c | 2 +- fs/xfs/xfs_log_recover.c | 2 +- fs/xfs/xfs_mount.c | 2 +- fs/xfs/xfs_trans.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-)
fs/xfs/libxfs/xfs_ag.c +1 -1
@@ -231,7 +231,7 @@ xfs_sbblock_init(struct xfs_buf *bp, struct aghdr_init_data *id) { - struct xfs_dsb *dsb = XFS_BUF_TO_SBP(bp); + struct xfs_dsb *dsb = bp->b_addr;xfs_sb_to_disk (dsb, &mp->m_sb); dsb->sb_inprogress =1 ;
fs/xfs/libxfs/xfs_format.h +0 -1
@@ -560,7 +560,6 @@ xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino)#define XFS_SB_DADDR ((xfs_daddr_t)0)/* daddr in filesystem/ag */ #define XFS_SB_BLOCK (mp) XFS_HDR_BLOCK(mp, XFS_SB_DADDR) -#define XFS_BUF_TO_SBP (bp) ((xfs_dsb_t *)((bp)->b_addr))#define XFS_HDR_BLOCK (mp,d) ((xfs_agblock_t)XFS_BB_TO_FSBT(mp,d))#define XFS_DADDR_TO_FSB (mp,d) XFS_AGB_TO_FSB(mp, \
fs/xfs/libxfs/xfs_sb.c +9 -8
@@ -220,7 +220,7 @@ xfs_validate_sb_common(struct xfs_buf *bp, struct xfs_sb *sbp) { - struct xfs_dsb *dsb = XFS_BUF_TO_SBP(bp); + struct xfs_dsb *dsb = bp->b_addr;uint32_t agcount =0 ;uint32_t rem;
@@ -681,7 +681,7 @@ xfs_sb_read_verify( {struct xfs_sb sb;struct xfs_mount *mp = bp->b_mount; -struct xfs_dsb *dsb =XFS_BUF_TO_SBP (bp); +struct xfs_dsb *dsb = bp->b_addr;int error;/*
@@ -707,7 +707,7 @@ xfs_sb_read_verify(* Check all the superblock fields. Don't byteswap the xquota flags * because _verify_common checks the on-disk values. */ -__xfs_sb_from_disk (&sb,XFS_BUF_TO_SBP (bp), false); +__xfs_sb_from_disk (&sb, bp->b_addr, false); error =xfs_validate_sb_common (mp, bp, &sb);if (error) goto out_error;
@@ -730,7 +730,7 @@ static voidxfs_sb_quiet_read_verify ( struct xfs_buf *bp) { -struct xfs_dsb *dsb =XFS_BUF_TO_SBP (bp); +struct xfs_dsb *dsb = bp->b_addr;if (dsb->sb_magicnum ==cpu_to_be32 (XFS_SB_MAGIC )) {/* XFS filesystem, verify noisily! */
@@ -748,13 +748,14 @@ xfs_sb_write_verify(struct xfs_sb sb;struct xfs_mount *mp = bp->b_mount;struct xfs_buf_log_item *bip = bp->b_log_item; +struct xfs_dsb *dsb = bp->b_addr;int error;/* * Check all the superblock fields. Don't byteswap the xquota flags * because _verify_common checks the on-disk values. */ -__xfs_sb_from_disk (&sb,XFS_BUF_TO_SBP (bp), false); +__xfs_sb_from_disk (&sb, dsb, false); error =xfs_validate_sb_common (mp, bp, &sb);if (error) goto out_error;
@@ -766,7 +767,7 @@ xfs_sb_write_verify(return ;if (bip) -XFS_BUF_TO_SBP (bp)->sb_lsn =cpu_to_be64 (bip->bli_item.li_lsn); + dsb->sb_lsn =cpu_to_be64 (bip->bli_item.li_lsn);xfs_buf_update_cksum (bp,XFS_SB_CRC_OFF );return ;
@@ -927,7 +928,7 @@ xfs_log_sb( mp->m_sb.sb_ifree =percpu_counter_sum (&mp->m_ifree); mp->m_sb.sb_fdblocks =percpu_counter_sum (&mp->m_fdblocks); -xfs_sb_to_disk (XFS_BUF_TO_SBP (bp), &mp->m_sb); +xfs_sb_to_disk (bp->b_addr, &mp->m_sb);xfs_trans_buf_set_type (tp, bp,XFS_BLFT_SB_BUF );xfs_trans_log_buf (tp, bp,0 ,sizeof (struct xfs_dsb ) -1 ); }
@@ -1007,7 +1008,7 @@ xfs_update_secondary_sbs( bp->b_ops = &xfs_sb_buf_ops;xfs_buf_oneshot (bp);xfs_buf_zero (bp,0 ,BBTOB (bp->b_length)); -xfs_sb_to_disk (XFS_BUF_TO_SBP (bp), &mp->m_sb); +xfs_sb_to_disk (bp->b_addr, &mp->m_sb);xfs_buf_delwri_queue (bp, &buffer_list);xfs_buf_relse (bp);
fs/xfs/scrub/agheader.c +1 -1
@@ -92,7 +92,7 @@ xchk_superblock(if (!xchk_process_error (sc, agno,XFS_SB_BLOCK (mp), &error))return error; - sb =XFS_BUF_TO_SBP (bp); + sb = bp->b_addr;/* * Verify the geometries match. Fields that are permanently
fs/xfs/scrub/agheader_repair.c +1 -1
@@ -49,7 +49,7 @@ xrep_superblock(/* Copy AG 0's superblock to this one. */ xfs_buf_zero (bp,0 ,BBTOB (bp->b_length)); -xfs_sb_to_disk (XFS_BUF_TO_SBP (bp), &mp->m_sb); +xfs_sb_to_disk (bp->b_addr, &mp->m_sb);/* Write this to disk. */ xfs_trans_buf_set_type (sc->tp, bp,XFS_BLFT_SB_BUF );
fs/xfs/xfs_log_recover.c +1 -1
@@ -5636,7 +5636,7 @@ xlog_do_recover(/* Convert superblock from on-disk format */ sbp = &mp->m_sb; -xfs_sb_from_disk (sbp,XFS_BUF_TO_SBP (bp)); +xfs_sb_from_disk (sbp, bp->b_addr);xfs_buf_relse (bp);/* re-initialise in-core superblock and geometry structures */
fs/xfs/xfs_mount.c +1 -1
@@ -310,7 +310,7 @@ xfs_readsb(/* * Initialize the mount structure from the superblock. */ -xfs_sb_from_disk (sbp,XFS_BUF_TO_SBP (bp)); +xfs_sb_from_disk (sbp, bp->b_addr);/* * If we haven't validated the superblock, do so now before we try
fs/xfs/xfs_trans.c +1 -1
@@ -450,7 +450,7 @@ xfs_trans_apply_sb_deltas(int whole =0 ; bp =xfs_trans_getsb (tp, tp->t_mountp); - sbp =XFS_BUF_TO_SBP (bp); + sbp = bp->b_addr;/* * Check that superblock mods match the mods made to AGF counters.
Signature · 1 line
2.24.1
Re: [PATCH 6/6] xfs: remove XFS_BUF_TO_SBP
Quoted 4 lines · Christoph Hellwig
Just dereference
bp->b_addrdirectly and make the code a little simpler and more clear.Signed-off-by Christoph Hellwig <[email protected]>
...
Quoted 23 lines
fs/xfs/libxfs/xfs_sb.c +2
-2@@ -220,7 +220,7 @@ xfs_validate_sb_common(struct xfs_buf *bp, struct xfs_sb *sbp) { - struct xfs_dsb *dsb = XFS_BUF_TO_SBP(bp); + struct xfs_dsb *dsb = bp->b_addr;uint32_t agcount =0 ;uint32_t rem;@@ -681,7 +681,7 @@ xfs_sb_read_verify( {struct xfs_sb sb;struct xfs_mount *mp = bp->b_mount; -struct xfs_dsb *dsb =XFS_BUF_TO_SBP (bp); +struct xfs_dsb *dsb = bp->b_addr;int error;/*
fs/xfs/libxfs/xfs_sb.c xfs_sb_read_verify( · line 710
Quoted 5 lines
fs/xfs/libxfs/xfs_sb.c +1
-1@@ -707,7 +707,7 @@ xfs_sb_read_verify(* Check all the superblock fields. Don't byteswap the xquota flags * because _verify_common checks the on-disk values. */ -__xfs_sb_from_disk (&sb,XFS_BUF_TO_SBP (bp), false); +__xfs_sb_from_disk (&sb, bp->b_addr, false);
why not dsb here
Quoted 15 lines
fs/xfs/libxfs/xfs_sb.c +1
-1error =xfs_validate_sb_common (mp, bp, &sb);if (error) goto out_error;@@ -730,7 +730,7 @@ static voidxfs_sb_quiet_read_verify ( struct xfs_buf *bp) { -struct xfs_dsb *dsb =XFS_BUF_TO_SBP (bp); +struct xfs_dsb *dsb = bp->b_addr;if (dsb->sb_magicnum ==cpu_to_be32 (XFS_SB_MAGIC )) {/* XFS filesystem, verify noisily! */ @@ -748,13 +748,14 @@ xfs_sb_write_verify(struct xfs_sb sb;struct xfs_mount *mp = bp->b_mount;
fs/xfs/libxfs/xfs_sb.c xfs_sb_write_verify( · line 758
Quoted 10 lines
fs/xfs/libxfs/xfs_sb.c +2
-1struct xfs_buf_log_item *bip = bp->b_log_item; +struct xfs_dsb *dsb = bp->b_addr;int error;/* * Check all the superblock fields. Don't byteswap the xquota flags * because _verify_common checks the on-disk values. */ -__xfs_sb_from_disk (&sb,XFS_BUF_TO_SBP (bp), false); +__xfs_sb_from_disk (&sb, dsb, false);
(as you did here)
Quoted 13 lines
fs/xfs/libxfs/xfs_sb.c +1
-1error =xfs_validate_sb_common (mp, bp, &sb);if (error) goto out_error;@@ -766,7 +767,7 @@ xfs_sb_write_verify(return ;if (bip) -XFS_BUF_TO_SBP (bp)->sb_lsn =cpu_to_be64 (bip->bli_item.li_lsn); + dsb->sb_lsn =cpu_to_be64 (bip->bli_item.li_lsn);xfs_buf_update_cksum (bp,XFS_SB_CRC_OFF );return ;
fs/xfs/libxfs/xfs_sb.c xfs_log_sb( · line 931
Quoted 5 lines
fs/xfs/libxfs/xfs_sb.c +1
-1@@ -927,7 +928,7 @@ xfs_log_sb( mp->m_sb.sb_ifree =percpu_counter_sum (&mp->m_ifree); mp->m_sb.sb_fdblocks =percpu_counter_sum (&mp->m_fdblocks); -xfs_sb_to_disk (XFS_BUF_TO_SBP (bp), &mp->m_sb); +xfs_sb_to_disk (bp->b_addr, &mp->m_sb);
hm no "dsb" in this case ...
In any case seems like if you already have a local xfs_dsb, use that vs. bp->b_addr?
-Eric
Re: [PATCH 6/6] xfs: remove XFS_BUF_TO_SBP
Quoted 8 lines · Eric Sandeen
fs/xfs/libxfs/xfs_sb.c xfs_sb_read_verify( · line 710
Quoted 6 lines
fs/xfs/libxfs/xfs_sb.c +1
-1@@ -707,7 +707,7 @@ xfs_sb_read_verify(* Check all the superblock fields. Don't byteswap the xquota flags * because _verify_common checks the on-disk values. */ -__xfs_sb_from_disk (&sb,XFS_BUF_TO_SBP (bp), false); +__xfs_sb_from_disk (&sb, bp->b_addr, false);why not dsb here
Yes, this should just pass dsb.
Quoted 2 lines
In any case seems like if you already have a local
xfs_dsb, use that vs.bp->b_addr?
That was the planned, but I obviously missed one spot.
Chandan Rajendra
Reviewed-byQuoted 6 lines · Christoph Hellwig
Hi all,
patch 1 is the interesting one that changes the struct agfl definition so that we avoid warnings from new gcc versions about taking the address of a member of a packed structure. The rest is random cleanups in related areas.
The changes look good to me,
Signature · 1 line
chandan