| Message ID | 20190215144725.8894-5-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [01/10] xfs: remove the io_type field from the writeback context and ioend | expand |
On Fri, Feb 15, 2019 at 03:47:19PM +0100, Christoph Hellwig wrote: > We want to be able to reuse them for the upcoming dedidcated delalloc > convert routine. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Brian Foster <bfoster@redhat.com> Looks ok to me... Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/libxfs/xfs_bmap.c | 78 ++++++++++++++++++++++------------------ > 1 file changed, 44 insertions(+), 34 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index 7fa454f71f46..a9c9bd39d822 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -4194,6 +4194,44 @@ xfs_bmapi_convert_unwritten( > return 0; > } > > +static inline xfs_extlen_t > +xfs_bmapi_minleft( > + struct xfs_trans *tp, > + struct xfs_inode *ip, > + int fork) > +{ > + if (tp && tp->t_firstblock != NULLFSBLOCK) > + return 0; > + if (XFS_IFORK_FORMAT(ip, fork) != XFS_DINODE_FMT_BTREE) > + return 1; > + return be16_to_cpu(XFS_IFORK_PTR(ip, fork)->if_broot->bb_level) + 1; > +} > + > +/* > + * Log whatever the flags say, even if error. Otherwise we might miss detecting > + * a case where the data is changed, there's an error, and it's not logged so we > + * don't shutdown when we should. Don't bother logging extents/btree changes if > + * we converted to the other format. > + */ > +static void > +xfs_bmapi_finish( > + struct xfs_bmalloca *bma, > + int whichfork, > + int error) > +{ > + if ((bma->logflags & xfs_ilog_fext(whichfork)) && > + XFS_IFORK_FORMAT(bma->ip, whichfork) != XFS_DINODE_FMT_EXTENTS) > + bma->logflags &= ~xfs_ilog_fext(whichfork); > + else if ((bma->logflags & xfs_ilog_fbroot(whichfork)) && > + XFS_IFORK_FORMAT(bma->ip, whichfork) != XFS_DINODE_FMT_BTREE) > + bma->logflags &= ~xfs_ilog_fbroot(whichfork); > + > + if (bma->logflags) > + xfs_trans_log_inode(bma->tp, bma->ip, bma->logflags); > + if (bma->cur) > + xfs_btree_del_cursor(bma->cur, error); > +} > + > /* > * Map file blocks to filesystem blocks, and allocate blocks or convert the > * extent state if necessary. Details behaviour is controlled by the flags > @@ -4273,15 +4311,6 @@ xfs_bmapi_write( > > XFS_STATS_INC(mp, xs_blk_mapw); > > - if (!tp || tp->t_firstblock == NULLFSBLOCK) { > - if (XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE) > - bma.minleft = be16_to_cpu(ifp->if_broot->bb_level) + 1; > - else > - bma.minleft = 1; > - } else { > - bma.minleft = 0; > - } > - > if (!(ifp->if_flags & XFS_IFEXTENTS)) { > error = xfs_iread_extents(tp, ip, whichfork); > if (error) > @@ -4296,6 +4325,7 @@ xfs_bmapi_write( > bma.ip = ip; > bma.total = total; > bma.datatype = 0; > + bma.minleft = xfs_bmapi_minleft(tp, ip, whichfork); > > /* > * The delalloc flag means the caller wants to allocate the entire > @@ -4434,32 +4464,12 @@ xfs_bmapi_write( > ASSERT(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE || > XFS_IFORK_NEXTENTS(ip, whichfork) > > XFS_IFORK_MAXEXT(ip, whichfork)); > - error = 0; > + xfs_bmapi_finish(&bma, whichfork, 0); > + xfs_bmap_validate_ret(orig_bno, orig_len, orig_flags, orig_mval, > + orig_nmap, *nmap); > + return 0; > error0: > - /* > - * Log everything. Do this after conversion, there's no point in > - * logging the extent records if we've converted to btree format. > - */ > - if ((bma.logflags & xfs_ilog_fext(whichfork)) && > - XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS) > - bma.logflags &= ~xfs_ilog_fext(whichfork); > - else if ((bma.logflags & xfs_ilog_fbroot(whichfork)) && > - XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE) > - bma.logflags &= ~xfs_ilog_fbroot(whichfork); > - /* > - * Log whatever the flags say, even if error. Otherwise we might miss > - * detecting a case where the data is changed, there's an error, > - * and it's not logged so we don't shutdown when we should. > - */ > - if (bma.logflags) > - xfs_trans_log_inode(tp, ip, bma.logflags); > - > - if (bma.cur) { > - xfs_btree_del_cursor(bma.cur, error); > - } > - if (!error) > - xfs_bmap_validate_ret(orig_bno, orig_len, orig_flags, orig_mval, > - orig_nmap, *nmap); > + xfs_bmapi_finish(&bma, whichfork, error); > return error; > } > > -- > 2.20.1 >
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 7fa454f71f46..a9c9bd39d822 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -4194,6 +4194,44 @@ xfs_bmapi_convert_unwritten( return 0; } +static inline xfs_extlen_t +xfs_bmapi_minleft( + struct xfs_trans *tp, + struct xfs_inode *ip, + int fork) +{ + if (tp && tp->t_firstblock != NULLFSBLOCK) + return 0; + if (XFS_IFORK_FORMAT(ip, fork) != XFS_DINODE_FMT_BTREE) + return 1; + return be16_to_cpu(XFS_IFORK_PTR(ip, fork)->if_broot->bb_level) + 1; +} + +/* + * Log whatever the flags say, even if error. Otherwise we might miss detecting + * a case where the data is changed, there's an error, and it's not logged so we + * don't shutdown when we should. Don't bother logging extents/btree changes if + * we converted to the other format. + */ +static void +xfs_bmapi_finish( + struct xfs_bmalloca *bma, + int whichfork, + int error) +{ + if ((bma->logflags & xfs_ilog_fext(whichfork)) && + XFS_IFORK_FORMAT(bma->ip, whichfork) != XFS_DINODE_FMT_EXTENTS) + bma->logflags &= ~xfs_ilog_fext(whichfork); + else if ((bma->logflags & xfs_ilog_fbroot(whichfork)) && + XFS_IFORK_FORMAT(bma->ip, whichfork) != XFS_DINODE_FMT_BTREE) + bma->logflags &= ~xfs_ilog_fbroot(whichfork); + + if (bma->logflags) + xfs_trans_log_inode(bma->tp, bma->ip, bma->logflags); + if (bma->cur) + xfs_btree_del_cursor(bma->cur, error); +} + /* * Map file blocks to filesystem blocks, and allocate blocks or convert the * extent state if necessary. Details behaviour is controlled by the flags @@ -4273,15 +4311,6 @@ xfs_bmapi_write( XFS_STATS_INC(mp, xs_blk_mapw); - if (!tp || tp->t_firstblock == NULLFSBLOCK) { - if (XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE) - bma.minleft = be16_to_cpu(ifp->if_broot->bb_level) + 1; - else - bma.minleft = 1; - } else { - bma.minleft = 0; - } - if (!(ifp->if_flags & XFS_IFEXTENTS)) { error = xfs_iread_extents(tp, ip, whichfork); if (error) @@ -4296,6 +4325,7 @@ xfs_bmapi_write( bma.ip = ip; bma.total = total; bma.datatype = 0; + bma.minleft = xfs_bmapi_minleft(tp, ip, whichfork); /* * The delalloc flag means the caller wants to allocate the entire @@ -4434,32 +4464,12 @@ xfs_bmapi_write( ASSERT(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE || XFS_IFORK_NEXTENTS(ip, whichfork) > XFS_IFORK_MAXEXT(ip, whichfork)); - error = 0; + xfs_bmapi_finish(&bma, whichfork, 0); + xfs_bmap_validate_ret(orig_bno, orig_len, orig_flags, orig_mval, + orig_nmap, *nmap); + return 0; error0: - /* - * Log everything. Do this after conversion, there's no point in - * logging the extent records if we've converted to btree format. - */ - if ((bma.logflags & xfs_ilog_fext(whichfork)) && - XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS) - bma.logflags &= ~xfs_ilog_fext(whichfork); - else if ((bma.logflags & xfs_ilog_fbroot(whichfork)) && - XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE) - bma.logflags &= ~xfs_ilog_fbroot(whichfork); - /* - * Log whatever the flags say, even if error. Otherwise we might miss - * detecting a case where the data is changed, there's an error, - * and it's not logged so we don't shutdown when we should. - */ - if (bma.logflags) - xfs_trans_log_inode(tp, ip, bma.logflags); - - if (bma.cur) { - xfs_btree_del_cursor(bma.cur, error); - } - if (!error) - xfs_bmap_validate_ret(orig_bno, orig_len, orig_flags, orig_mval, - orig_nmap, *nmap); + xfs_bmapi_finish(&bma, whichfork, error); return error; }