xfs: allow unaligned extent records in xfs_bmbt_disk_set_all
authorChristoph Hellwig <hch@lst.de>
Fri, 3 Nov 2017 17:34:45 +0000 (10:34 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Mon, 6 Nov 2017 19:53:41 +0000 (11:53 -0800)
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>
fs/xfs/libxfs/xfs_bmap_btree.c

index 086e6fc8e4fcefb877215ef05e25fea229731512..89260972a0f660785d37f4cd3ec223e9859d849f 100644 (file)
@@ -199,14 +199,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);
 }
 
 /*