]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: allow unaligned extent records in xfs_bmbt_disk_set_all
authorChristoph Hellwig <hch@lst.de>
Fri, 17 Nov 2017 04:11:35 +0000 (22:11 -0600)
committerEric Sandeen <sandeen@redhat.com>
Fri, 17 Nov 2017 04:11:35 +0000 (22:11 -0600)
Source kernel commit: 135dcc10d6ebf6184686042ec8b098e376252fff

To make life a little simpler make xfs_bmbt_set_all unaligned access
aware so that we can use it directly on the destination buffer.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
libxfs/xfs_bmap_btree.c

index f3d6b7fb17b7030080869cb95184df3b61755adc..3f011bc9461a75125257bc8f0d679ba9911602d3 100644 (file)
@@ -196,14 +196,14 @@ xfs_bmbt_disk_set_all(
        ASSERT(!(s->br_blockcount & xfs_mask64hi(64-BMBT_BLOCKCOUNT_BITLEN)));
        ASSERT(!(s->br_startblock & xfs_mask64hi(64-BMBT_STARTBLOCK_BITLEN)));
 
-       r->l0 = cpu_to_be64(
+       put_unaligned_be64(
                ((xfs_bmbt_rec_base_t)extent_flag << 63) |
                 ((xfs_bmbt_rec_base_t)s->br_startoff << 9) |
-                ((xfs_bmbt_rec_base_t)s->br_startblock >> 43));
-       r->l1 = cpu_to_be64(
+                ((xfs_bmbt_rec_base_t)s->br_startblock >> 43), &r->l0);
+       put_unaligned_be64(
                ((xfs_bmbt_rec_base_t)s->br_startblock << 21) |
                 ((xfs_bmbt_rec_base_t)s->br_blockcount &
-                 (xfs_bmbt_rec_base_t)xfs_mask64lo(21)));
+                 (xfs_bmbt_rec_base_t)xfs_mask64lo(21)), &r->l1);
 }
 
 /*