diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-11-16 22:11:34 -0600 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2017-11-16 22:11:34 -0600 |
| commit | 36d7c0a0af5af01b8714c25243b17a597894f7b9 (patch) | |
| tree | 9b865df956aee923236f95fc477d2f92f52b7d4a | |
| parent | c162e3194bc34dcf7719693ba996dcb9be89e1ff (diff) | |
| download | xfsprogs-dev-36d7c0a0af5af01b8714c25243b17a597894f7b9.tar.gz | |
xfs: pass an on-disk extent to xfs_bmbt_validate_extent
Source kernel commit: f36bc228e1b94d9994915cba67588104ebe763ae
This prepares for getting rid of the current in-memory extent format.
At the end of the series we will change the calling convention again
to pass the xfs_bmbt_irec structure once it is available everywhere.
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.c | 6 | ||||
| -rw-r--r-- | libxfs/xfs_bmap_btree.h | 4 | ||||
| -rw-r--r-- | libxfs/xfs_inode_fork.c | 9 |
3 files changed, 9 insertions, 10 deletions
diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 80039ffcfb..4637bad5cf 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -1251,14 +1251,14 @@ xfs_iread_extents( frp = XFS_BMBT_REC_ADDR(mp, block, 1); for (j = 0; j < num_recs; j++, i++, frp++) { xfs_bmbt_rec_host_t *trp = xfs_iext_get_ext(ifp, i); - trp->l0 = be64_to_cpu(frp->l0); - trp->l1 = be64_to_cpu(frp->l1); - if (!xfs_bmbt_validate_extent(mp, whichfork, trp)) { + if (!xfs_bmbt_validate_extent(mp, whichfork, frp)) { XFS_ERROR_REPORT("xfs_bmap_read_extents(2)", XFS_ERRLEVEL_LOW, mp); error = -EFSCORRUPTED; goto out_brelse; } + trp->l0 = be64_to_cpu(frp->l0); + trp->l1 = be64_to_cpu(frp->l1); trace_xfs_read_extent(ip, i, state, _THIS_IP_); } xfs_trans_brelse(tp, bp); diff --git a/libxfs/xfs_bmap_btree.h b/libxfs/xfs_bmap_btree.h index 6f891eeb88..2fbfe2a24b 100644 --- a/libxfs/xfs_bmap_btree.h +++ b/libxfs/xfs_bmap_btree.h @@ -127,9 +127,9 @@ extern struct xfs_btree_cur *xfs_bmbt_init_cursor(struct xfs_mount *, * Check that the extent does not contain an invalid unwritten extent flag. */ static inline bool xfs_bmbt_validate_extent(struct xfs_mount *mp, int whichfork, - struct xfs_bmbt_rec_host *ep) + struct xfs_bmbt_rec *ep) { - if (ep->l0 >> (64 - BMBT_EXNTFLAG_BITLEN) == 0) + if (get_unaligned_be64(&ep->l0) >> (64 - BMBT_EXNTFLAG_BITLEN) == 0) return true; if (whichfork == XFS_DATA_FORK && xfs_sb_version_hasextflgbit(&mp->m_sb)) diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c index 4502de31fb..42d083b2bb 100644 --- a/libxfs/xfs_inode_fork.c +++ b/libxfs/xfs_inode_fork.c @@ -368,13 +368,13 @@ xfs_iformat_extents( dp = (xfs_bmbt_rec_t *) XFS_DFORK_PTR(dip, whichfork); for (i = 0; i < nex; i++, dp++) { xfs_bmbt_rec_host_t *ep = xfs_iext_get_ext(ifp, i); - ep->l0 = get_unaligned_be64(&dp->l0); - ep->l1 = get_unaligned_be64(&dp->l1); - if (!xfs_bmbt_validate_extent(mp, whichfork, ep)) { + if (!xfs_bmbt_validate_extent(mp, whichfork, dp)) { XFS_ERROR_REPORT("xfs_iformat_extents(2)", XFS_ERRLEVEL_LOW, mp); return -EFSCORRUPTED; } + ep->l0 = get_unaligned_be64(&dp->l0); + ep->l1 = get_unaligned_be64(&dp->l1); trace_xfs_read_extent(ip, i, state, _THIS_IP_); } } @@ -761,8 +761,6 @@ xfs_iextents_copy( for (i = 0; i < nrecs; i++) { xfs_bmbt_rec_host_t *ep = xfs_iext_get_ext(ifp, i); - ASSERT(xfs_bmbt_validate_extent(ip->i_mount, whichfork, ep)); - start_block = xfs_bmbt_get_startblock(ep); if (isnullstartblock(start_block)) { /* @@ -776,6 +774,7 @@ xfs_iextents_copy( /* Translate to on disk format */ put_unaligned_be64(ep->l0, &dp->l0); put_unaligned_be64(ep->l1, &dp->l1); + ASSERT(xfs_bmbt_validate_extent(ip->i_mount, whichfork, dp)); dp++; copied++; |