xfs: don't take addresses of packed structures
cover xfs: don't take addresses of packed structures
newer gcc complains when we try to get the address of a packed structure:
xfs_format.h:790:3: warning: taking address of packed member of ‘struct xfs_agfl’ may result in an unaligned pointer value [-Waddress-of-packed-member]
xfs_rmap_btree.c:188:15: warning: taking address of packed member of ‘struct xfs_rmap_key’ may result in an unaligned pointer value [-Waddress-of-packed-member]
Dave had sent a patch to turn the warning off globally, but that seems like a big hammer, I dunno. Here are 2 patches to work around it instead.
Not tested yet, just seeing how loud people may scream at the ideas.
PATCH 1/2 xfs: don't take addresses of packed xfs_agfl_t member
gcc now warns about taking an address of a packed structure member.
Work around this by using offsetof() instead.
Thanks to bfoster for the suggestion and djwong for reiterating it.
---
fs/xfs/libxfs/xfs_format.h +2 -1
@@ -787,7 +787,8 @@ typedef struct xfs_agi {#define XFS_BUF_TO_AGFL_BNO (mp, bp) \ (xfs_sb_version_hascrc(&((mp)->m_sb)) ? \ - &(XFS_BUF_TO_AGFL(bp)->agfl_bno[0]) : \ + (__be32 *)((char *)(bp)->b_addr + \ + offsetof(struct xfs_agfl, agfl_bno)) : \ (__be32 *)(bp)->b_addr) typedef struct xfs_agfl {
Re: [PATCH 1/2] xfs: don't take addresses of packed xfs_agfl_t member
Quoted 14 lines · Eric Sandeen
gcc now warns about taking an address of a packed structure member.
Work around this by using
offsetof()instead.Thanks to bfoster for the suggestion and djwong for reiterating it.
Signed-off-by Eric Sandeen <[email protected]>---
fs/xfs/libxfs/xfs_format.h +0
-0
fs/xfs/libxfs/xfs_format.h typedef struct xfs_agi { · line 792
Quoted 7 lines
fs/xfs/libxfs/xfs_format.h +2
-1@@ -787,7 +787,8 @@ typedef struct xfs_agi {#define XFS_BUF_TO_AGFL_BNO (mp, bp) \ (xfs_sb_version_hascrc(&((mp)->m_sb)) ? \ - &(XFS_BUF_TO_AGFL(bp)->agfl_bno[0]) : \ + (__be32 *)((char *)(bp)->b_addr + \ + offsetof(struct xfs_agfl, agfl_bno)) : \ (__be32 *)(bp)->b_addr)
Yikes. If we want to go down this route this really needs to become an inline function (and fiven that it touches buffer is has no business in xfs_format.h).
But I absolutely do not see the point. If agfl_bno was unalgined so is adding the offsetoff. The warnings makes no sense, and there is a good reason the kernel build turned it off.
Re: [PATCH 1/2] xfs: don't take addresses of packed xfs_agfl_t member
Quoted 16 lines · Christoph Hellwig
Quoted 15 lines · Eric Sandeen
gcc now warns about taking an address of a packed structure member.
Work around this by using
offsetof()instead.Thanks to bfoster for the suggestion and djwong for reiterating it.
Signed-off-by Eric Sandeen <[email protected]>---
fs/xfs/libxfs/xfs_format.h +0
-0@@ -787,7 +787,8 @@ typedef struct xfs_agi {
Quoted 10 lines
fs/xfs/libxfs/xfs_format.h typedef struct xfs_agi { · line 792
Quoted 6 lines
fs/xfs/libxfs/xfs_format.h +2
-1#define XFS_BUF_TO_AGFL_BNO (mp, bp) \ (xfs_sb_version_hascrc(&((mp)->m_sb)) ? \ - &(XFS_BUF_TO_AGFL(bp)->agfl_bno[0]) : \ + (__be32 *)((char *)(bp)->b_addr + \ + offsetof(struct xfs_agfl, agfl_bno)) : \ (__be32 *)(bp)->b_addr)Yikes. If we want to go down this route this really needs to become an inline function (and fiven that it touches buffer is has no business in
xfs_format.h).
fair point
Quoted 4 lines
But I absolutely do not see the point. If
agfl_bnowas unalgined so is adding the offsetoff. The warnings makes no sense, and there is a good reason the kernel build turned it off.
Why do the warnings make no sense?
TBH, the above construction actually makes a lot more intuitive sense to me, alignment concerns or not.
-Eric
Re: [PATCH 1/2] xfs: don't take addresses of packed xfs_agfl_t member
Quoted 6 lines · Eric Sandeen
Quoted 4 lines
But I absolutely do not see the point. If
agfl_bnowas unalgined so is adding the offsetoff. The warnings makes no sense, and there is a good reason the kernel build turned it off.Why do the warnings make no sense?
Because taking the address of a member of a packed struct itself doesn't mean it is misaligned. Taking the address of misaligned member does that. And adding a non-aligned offset to a pointer will make it just as misaligned.
Quoted 2 lines
TBH, the above construction actually makes a lot more intuitive sense to me, alignment concerns or not.
Using offsetoff to take the address of a struct member is really strange.
If we want to stop taking the address of agfl_bno we should just remove the field entirely:
fs/xfs/libxfs/xfs_alloc.c +7 -6
@@ -585,11 +585,12 @@ xfs_alloc_fixup_trees(static xfs_failaddr_t xfs_agfl_verify ( -struct xfs_buf *bp) +struct xfs_buf *bp) { -struct xfs_mount *mp = bp->b_mount; -struct xfs_agfl *agfl =XFS_BUF_TO_AGFL (bp); -int i; +struct xfs_mount *mp = bp->b_mount; +struct xfs_agfl *agfl =XFS_BUF_TO_AGFL (bp); +__be32 *agfl_bno =XFS_BUF_TO_AGFL_BNO (mp, bp); +int i;/* * There is no verification of non-crc AGFLs because mkfs does not
@@ -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; }
fs/xfs/libxfs/xfs_format.h +8 -8
@@ -783,21 +783,21 @@ 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)) -#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) +#define XFS_BUF_TO_AGFL_BNO (mp, bp) \ + ((__be32 *) \ + (xfs_sb_version_hascrc(&((mp)->m_sb)) ? \ + (bp)->b_addr : \ + ((bp)->b_addr + sizeof(struct xfs_agfl)))) -typedef struct xfs_agfl { +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 ; +} __attribute__((packed));#define XFS_AGFL_CRC_OFF offsetof(struct xfs_agfl, agfl_crc)
Re: [PATCH 1/2] xfs: don't take addresses of packed xfs_agfl_t member
Quoted 64 lines · Christoph Hellwig
Quoted 6 lines · Eric Sandeen
Quoted 4 lines
But I absolutely do not see the point. If
agfl_bnowas unalgined so is adding the offsetoff. The warnings makes no sense, and there is a good reason the kernel build turned it off.Why do the warnings make no sense?
Because taking the address of a member of a packed struct itself doesn't mean it is misaligned. Taking the address of misaligned member does that. And adding a non-aligned offset to a pointer will make it just as misaligned.
Quoted 2 lines
TBH, the above construction actually makes a lot more intuitive sense to me, alignment concerns or not.
Using offsetoff to take the address of a struct member is really strange.
If we want to stop taking the address of
agfl_bnowe should just remove the field entirely:fs/xfs/libxfs/xfs_alloc.c +7
-6@@ -585,11 +585,12 @@ xfs_alloc_fixup_trees(static xfs_failaddr_t xfs_agfl_verify ( -struct xfs_buf *bp) +struct xfs_buf *bp) { -struct xfs_mount *mp = bp->b_mount; -struct xfs_agfl *agfl =XFS_BUF_TO_AGFL (bp); -int i; +struct xfs_mount *mp = bp->b_mount; +struct xfs_agfl *agfl =XFS_BUF_TO_AGFL (bp); +__be32 *agfl_bno =XFS_BUF_TO_AGFL_BNO (mp, bp); +int i;/* * There is no verification of non-crc AGFLs because mkfs does not @@ -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; }fs/xfs/libxfs/xfs_format.h +1
-1@@ -783,21 +783,21 @@ 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))
fs/xfs/libxfs/xfs_format.h typedef struct xfs_agi { · line 792
Quoted 10 lines
fs/xfs/libxfs/xfs_format.h +5
-4-#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) +#define XFS_BUF_TO_AGFL_BNO (mp, bp) \ + ((__be32 *) \ + (xfs_sb_version_hascrc(&((mp)->m_sb)) ? \ + (bp)->b_addr : \ + ((bp)->b_addr + sizeof(struct xfs_agfl))))
This is backwards
fs/xfs/libxfs/xfs_format.h typedef struct xfs_agi { · line 802
Quoted 13 lines
fs/xfs/libxfs/xfs_format.h +2
-3-typedef struct xfs_agfl { +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 ; +} __attribute__((packed));#define XFS_AGFL_CRC_OFF offsetof(struct xfs_agfl, agfl_crc)
<peers past whitespace changes> ;)
other than that, this approach seems reasonable too.
-Eric
PATCH 2/2 xfs: don't take addresses of packed xfs_rmap_key
In reply to Eric Sandeengcc now warns about taking an address of a packed structure member.
This happens here because of how be32_add_cpu() works; just open-code the modification using a temporary variable instead.
---
fs/xfs/libxfs/xfs_rmap_btree.c +3 -1
@@ -182,12 +182,14 @@ xfs_rmapbt_init_high_key_from_rec( union xfs_btree_rec *rec) {uint64_t off; +xfs_agblock_t start;int adj; adj =be32_to_cpu (rec->rmap.rm_blockcount) -1 ; key->rmap.rm_startblock = rec->rmap.rm_startblock; -be32_add_cpu (&key->rmap.rm_startblock, adj); + start =be32_to_cpu (rec->rmap.rm_startblock) - adj; + rec->rmap.rm_startblock =cpu_to_be32 (start); key->rmap.rm_owner = rec->rmap.rm_owner; key->rmap.rm_offset = rec->rmap.rm_offset; if (XFS_RMAP_NON_INODE_OWNER(be64_to_cpu(rec->rmap.rm_owner)) ||
Re: [PATCH 2/2] xfs: don't take addresses of packed xfs_rmap_key
Quoted 13 lines · Eric Sandeen
gcc now warns about taking an address of a packed structure member.
This happens here because of how
be32_add_cpu()works; just open-code the modification using a temporary variable instead.Signed-off-by Eric Sandeen <[email protected]>---
fs/xfs/libxfs/xfs_rmap_btree.c +0
-0
fs/xfs/libxfs/xfs_rmap_btree.c xfs_rmapbt_init_high_key_from_rec( · line 190
Quoted 9 lines
fs/xfs/libxfs/xfs_rmap_btree.c +1
-0@@ -182,12 +182,14 @@ xfs_rmapbt_init_high_key_from_rec( union xfs_btree_rec *rec) {uint64_t off; +xfs_agblock_t start;int adj; adj =be32_to_cpu (rec->rmap.rm_blockcount) -1 ; key->rmap.rm_startblock = rec->rmap.rm_startblock;
I was gonna say to kill this statement since you set it again two lines later, but then spotted a bug two lines down...
fs/xfs/libxfs/xfs_rmap_btree.c xfs_rmapbt_init_high_key_from_rec( · line 192
Quoted 3 lines
fs/xfs/libxfs/xfs_rmap_btree.c +2
-1-be32_add_cpu (&key->rmap.rm_startblock, adj); + start =be32_to_cpu (rec->rmap.rm_startblock) - adj; + rec->rmap.rm_startblock =cpu_to_be32 (start);
...this should be setting key->rmap.rm_startblock.
--D
Quoted 5 lines
fs/xfs/libxfs/xfs_rmap_btree.c +0
-0key->rmap.rm_owner = rec->rmap.rm_owner; key->rmap.rm_offset = rec->rmap.rm_offset; if (XFS_RMAP_NON_INODE_OWNER(be64_to_cpu(rec->rmap.rm_owner)) ||
Re: [PATCH 2/2] xfs: don't take addresses of packed xfs_rmap_key
Quoted 22 lines · Darrick J. Wong
Quoted 21 lines · Eric Sandeen
gcc now warns about taking an address of a packed structure member.
This happens here because of how
be32_add_cpu()works; just open-code the modification using a temporary variable instead.Signed-off-by Eric Sandeen <[email protected]>---
fs/xfs/libxfs/xfs_rmap_btree.c +1
-0@@ -182,12 +182,14 @@ xfs_rmapbt_init_high_key_from_rec( union xfs_btree_rec *rec) {uint64_t off; +xfs_agblock_t start;int adj; adj =be32_to_cpu (rec->rmap.rm_blockcount) -1 ;
Quoted 8 lines
fs/xfs/libxfs/xfs_rmap_btree.c xfs_rmapbt_init_high_key_from_rec( · line 190
Quoted 1 line
fs/xfs/libxfs/xfs_rmap_btree.c +0
-0key->rmap.rm_startblock = rec->rmap.rm_startblock;I was gonna say to kill this statement since you set it again two lines later, but then spotted a bug two lines down...
fs/xfs/libxfs/xfs_rmap_btree.c xfs_rmapbt_init_high_key_from_rec( · line 192
Quoted 3 lines
fs/xfs/libxfs/xfs_rmap_btree.c +2
-1-be32_add_cpu (&key->rmap.rm_startblock, adj); + start =be32_to_cpu (rec->rmap.rm_startblock) - adj; + rec->rmap.rm_startblock =cpu_to_be32 (start);
/searches for that brown paper bag
thanks
-Eric
PATCH v2 2/2 xfs: don't take addresses of packed xfs_rmap_key member
In reply to Eric Sandeengcc now warns about taking an address of a packed structure member.
This happens here because of how be32_add_cpu() works; just open-code the modification using a temporary variable instead.
---
V2: fix key-> vs rec-> derp derp thinko
fs/xfs/libxfs/xfs_rmap_btree.c +3 -1
@@ -182,12 +182,14 @@ xfs_rmapbt_init_high_key_from_rec( union xfs_btree_rec *rec) {uint64_t off; +xfs_agblock_t start;int adj; adj =be32_to_cpu (rec->rmap.rm_blockcount) -1 ; key->rmap.rm_startblock = rec->rmap.rm_startblock; -be32_add_cpu (&key->rmap.rm_startblock, adj); + start =be32_to_cpu (key->rmap.rm_startblock) - adj; + key->rmap.rm_startblock =cpu_to_be32 (start); key->rmap.rm_owner = rec->rmap.rm_owner; key->rmap.rm_offset = rec->rmap.rm_offset; if (XFS_RMAP_NON_INODE_OWNER(be64_to_cpu(rec->rmap.rm_owner)) ||
Re: [PATCH 2/2 V2] xfs: don't take addresses of packed xfs_rmap_key member
fs/xfs/libxfs/xfs_rmap_btree.c xfs_rmapbt_init_high_key_from_rec( · line 192
Quoted 11 lines · Eric Sandeen
{
fs/xfs/libxfs/xfs_rmap_btree.c +3
-1uint64_t off; +xfs_agblock_t start;int adj; adj =be32_to_cpu (rec->rmap.rm_blockcount) -1 ; key->rmap.rm_startblock = rec->rmap.rm_startblock; -be32_add_cpu (&key->rmap.rm_startblock, adj); + start =be32_to_cpu (key->rmap.rm_startblock) - adj; + key->rmap.rm_startblock =cpu_to_be32 (start);
Do we really need the local variable? Why not:
key->rmap.rm_startblock = cpu_to_be32(be32_to_cpu(key->rmap.rm_startblock) - adj);
Re: [PATCH 2/2 V2] xfs: don't take addresses of packed xfs_rmap_key member
Quoted 15 lines · Christoph Hellwig
fs/xfs/libxfs/xfs_rmap_btree.c xfs_rmapbt_init_high_key_from_rec( · line 192
Quoted 11 lines · Eric Sandeen
{
fs/xfs/libxfs/xfs_rmap_btree.c +3
-1uint64_t off; +xfs_agblock_t start;int adj; adj =be32_to_cpu (rec->rmap.rm_blockcount) -1 ; key->rmap.rm_startblock = rec->rmap.rm_startblock; -be32_add_cpu (&key->rmap.rm_startblock, adj); + start =be32_to_cpu (key->rmap.rm_startblock) - adj; + key->rmap.rm_startblock =cpu_to_be32 (start);Do we really need the local variable? Why not:
Quoted 3 lines
key->rmap.rm_startblock = cpu_to_be32(be32_to_cpu(key->rmap.rm_startblock) - adj);
Sure
-Eric
PATCH v3 2/2 xfs: don't take addresses of packed xfs_rmap_key member
In reply to Eric Sandeengcc now warns about taking an address of a packed structure member.
This happens here because of how be32_add_cpu() works; just open-code the modification instead.
---
V2: fix key-> vs rec-> derp derp thinko
V3: drop local temp variable, add comment
fs/xfs/libxfs/xfs_rmap_btree.c +3 -1
@@ -187,7 +187,9 @@ xfs_rmapbt_init_high_key_from_rec( adj =be32_to_cpu (rec->rmap.rm_blockcount) -1 ; key->rmap.rm_startblock = rec->rmap.rm_startblock; -be32_add_cpu (&key->rmap.rm_startblock, adj); +/* do this manually to avoid gcc warning about alignment */ + key->rmap.rm_startblock = +cpu_to_be32 (be32_to_cpu (key->rmap.rm_startblock) - adj); key->rmap.rm_owner = rec->rmap.rm_owner; key->rmap.rm_offset = rec->rmap.rm_offset; if (XFS_RMAP_NON_INODE_OWNER(be64_to_cpu(rec->rmap.rm_owner)) ||
Re: [PATCH 2/2 V3] xfs: don't take addresses of packed xfs_rmap_key member
Quoted 6 lines · Eric Sandeen
gcc now warns about taking an address of a packed structure member.
This happens here because of how
be32_add_cpu()works; just open-code the modification instead.Signed-off-by Eric Sandeen <[email protected]>
Looks good,
Re: [PATCH 2/2 V3] xfs: don't take addresses of packed xfs_rmap_key member
In reply to Eric SandeenQuoted 15 lines · Eric Sandeen
gcc now warns about taking an address of a packed structure member.
This happens here because of how
be32_add_cpu()works; just open-code the modification instead.Signed-off-by Eric Sandeen <[email protected]>---
V2: fix key-> vs rec-> derp derp thinko
V3: drop local temp variable, add commentfs/xfs/libxfs/xfs_rmap_btree.c +0
-0
fs/xfs/libxfs/xfs_rmap_btree.c xfs_rmapbt_init_high_key_from_rec( · line 192
Quoted 7 lines
fs/xfs/libxfs/xfs_rmap_btree.c +3
-1@@ -187,7 +187,9 @@ xfs_rmapbt_init_high_key_from_rec( adj =be32_to_cpu (rec->rmap.rm_blockcount) -1 ; key->rmap.rm_startblock = rec->rmap.rm_startblock; -be32_add_cpu (&key->rmap.rm_startblock, adj); +/* do this manually to avoid gcc warning about alignment */ + key->rmap.rm_startblock = +cpu_to_be32 (be32_to_cpu (key->rmap.rm_startblock) - adj);
<blink>
This should be getting the value from rec->rmap, not key->rmap.
This should be adding adj, not subtracting it, since that's what the original code did.
And finally, there's no need to set the value twice.
--D
Quoted 5 lines
fs/xfs/libxfs/xfs_rmap_btree.c +0
-0key->rmap.rm_owner = rec->rmap.rm_owner; key->rmap.rm_offset = rec->rmap.rm_offset; if (XFS_RMAP_NON_INODE_OWNER(be64_to_cpu(rec->rmap.rm_owner)) ||
Re: [PATCH 2/2 V3] xfs: don't take addresses of packed xfs_rmap_key member
Quoted 1 line · Darrick J. Wong
On Wed, Jan 29, 2020 at 12:35:21PM -0600, Eric Sandeen wrote:
...
Quoted 11 lines
fs/xfs/libxfs/xfs_rmap_btree.c xfs_rmapbt_init_high_key_from_rec( · line 192
Quoted 8 lines
fs/xfs/libxfs/xfs_rmap_btree.c +3
-1@@ -187,7 +187,9 @@ xfs_rmapbt_init_high_key_from_rec( adj =be32_to_cpu (rec->rmap.rm_blockcount) -1 ; key->rmap.rm_startblock = rec->rmap.rm_startblock; -be32_add_cpu (&key->rmap.rm_startblock, adj); +/* do this manually to avoid gcc warning about alignment */ + key->rmap.rm_startblock = +cpu_to_be32 (be32_to_cpu (key->rmap.rm_startblock) - adj);<blink>
Quoted 4 lines
This should be getting the value from
rec->rmap, notkey->rmap.This should be adding adj, not subtracting it, since that's what the original code did.
*sigh* I got nothin' here tbh.
Re: [PATCH 2/2 V3] xfs: don't take addresses of packed xfs_rmap_key member
Quoted 16 lines · Eric Sandeen
Quoted 1 line · Darrick J. Wong
On Wed, Jan 29, 2020 at 12:35:21PM -0600, Eric Sandeen wrote:
...
Quoted 11 lines
fs/xfs/libxfs/xfs_rmap_btree.c xfs_rmapbt_init_high_key_from_rec( · line 192
Quoted 8 lines
fs/xfs/libxfs/xfs_rmap_btree.c +3
-1@@ -187,7 +187,9 @@ xfs_rmapbt_init_high_key_from_rec( adj =be32_to_cpu (rec->rmap.rm_blockcount) -1 ; key->rmap.rm_startblock = rec->rmap.rm_startblock; -be32_add_cpu (&key->rmap.rm_startblock, adj); +/* do this manually to avoid gcc warning about alignment */ + key->rmap.rm_startblock = +cpu_to_be32 (be32_to_cpu (key->rmap.rm_startblock) - adj);<blink>
Quoted 7 lines
Quoted 4 lines
This should be getting the value from
rec->rmap, notkey->rmap.This should be adding adj, not subtracting it, since that's what the original code did.
*sigh* I got nothin' here tbh.
Let's just drop this patch. The first patch in this series is obviated by hch's work and AFAIK the kernel just turned off this warning, we can do the same in userspace and make this 2nd issue go away.
-Eric