diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-11-16 22:11:35 -0600 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2017-11-16 22:11:35 -0600 |
| commit | c2e6c70434f50d9f386aad3586dea38fcf55689d (patch) | |
| tree | ff5b38165074454904c156ac14bbbc176963328a | |
| parent | 07fe4665c3ccc9a8f128f624a16622323a58f2ef (diff) | |
| download | xfsprogs-dev-c2e6c70434f50d9f386aad3586dea38fcf55689d.tar.gz | |
xfs: allow unaligned extent records in xfs_bmbt_disk_set_all
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>
| -rw-r--r-- | libxfs/xfs_bmap_btree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c index f3d6b7fb17..3f011bc946 100644 --- a/libxfs/xfs_bmap_btree.c +++ b/libxfs/xfs_bmap_btree.c @@ -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); } /* |