| Message ID | 20170918152422.24345-2-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Sep 18, 2017 at 08:24:04AM -0700, Christoph Hellwig wrote: > There was one spot in xfs_bmap_add_extent_unwritten_real that didn't use the > passed in new extent state but always converted to normal, leading to wrong > behavior when converting from normal to unwritten. > > Only found by code inspection, it seems like this code path to move partial > extent from written to unwritten while merging it with the next extent is > rarely exercised. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > fs/xfs/libxfs/xfs_bmap.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index 459f4b4f08fe..f2f5bdb9e092 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -2573,7 +2573,7 @@ xfs_bmap_add_extent_unwritten_real( > &i))) > goto done; > XFS_WANT_CORRUPTED_GOTO(mp, i == 0, done); > - cur->bc_rec.b.br_state = XFS_EXT_NORM; > + cur->bc_rec.b.br_state = new->br_state; > if ((error = xfs_btree_insert(cur, &i))) > goto done; > XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done); > -- > 2.14.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 459f4b4f08fe..f2f5bdb9e092 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -2573,7 +2573,7 @@ xfs_bmap_add_extent_unwritten_real( &i))) goto done; XFS_WANT_CORRUPTED_GOTO(mp, i == 0, done); - cur->bc_rec.b.br_state = XFS_EXT_NORM; + cur->bc_rec.b.br_state = new->br_state; if ((error = xfs_btree_insert(cur, &i))) goto done; XFS_WANT_CORRUPTED_GOTO(mp, i == 1, done);