[PATCH 2/2 V2] xfs: don't take addresses of packed xfs_rmap_key member

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 <sandeen@xxxxxxxxxx>
---

V2: fix key-> vs rec-> derp derp thinko

diff --git a/fs/xfs/libxfs/xfs_rmap_btree.c b/fs/xfs/libxfs/xfs_rmap_btree.c
index fc78efa52c94..9e5ac773fc9e 100644
--- a/fs/xfs/libxfs/xfs_rmap_btree.c
+++ b/fs/xfs/libxfs/xfs_rmap_btree.c
@@ -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)) ||




[Index of Archives]     [XFS Filesystem Development (older mail)]     [Linux Filesystem Development]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux RAID]     [Linux SCSI]


  Powered by Linux