| Message ID | 20190909182722.16783-18-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/19] iomap: better document the IOMAP_F_* flags | expand |
Looks fine: Reviewed-by: Allison Collins <allison.henderson@oracle.com> On 9/9/19 11:27 AM, Christoph Hellwig wrote: > Renaming whichfork to allocfork in xfs_buffered_write_iomap_begin makes > the usage of this variable a little more clear. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > fs/xfs/xfs_iomap.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c > index 6dd143374d75..0e575ca1e3fc 100644 > --- a/fs/xfs/xfs_iomap.c > +++ b/fs/xfs/xfs_iomap.c > @@ -862,7 +862,7 @@ xfs_buffered_write_iomap_begin( > struct xfs_iext_cursor icur, ccur; > xfs_fsblock_t prealloc_blocks = 0; > bool eof = false, cow_eof = false, shared = false; > - int whichfork = XFS_DATA_FORK; > + int allocfork = XFS_DATA_FORK; > int error = 0; > > /* we can't use delayed allocations when using extent size hints */ > @@ -959,7 +959,7 @@ xfs_buffered_write_iomap_begin( > * Fork all the shared blocks from our write offset until the > * end of the extent. > */ > - whichfork = XFS_COW_FORK; > + allocfork = XFS_COW_FORK; > end_fsb = imap.br_startoff + imap.br_blockcount; > } else { > /* > @@ -975,7 +975,7 @@ xfs_buffered_write_iomap_begin( > end_fsb = xfs_iomap_end_fsb(mp, offset, count); > > if (xfs_is_always_cow_inode(ip)) > - whichfork = XFS_COW_FORK; > + allocfork = XFS_COW_FORK; > } > > error = xfs_qm_dqattach_locked(ip, false); > @@ -983,7 +983,7 @@ xfs_buffered_write_iomap_begin( > goto out_unlock; > > if (eof) { > - prealloc_blocks = xfs_iomap_prealloc_size(ip, whichfork, offset, > + prealloc_blocks = xfs_iomap_prealloc_size(ip, allocfork, offset, > count, &icur); > if (prealloc_blocks) { > xfs_extlen_t align; > @@ -1006,11 +1006,11 @@ xfs_buffered_write_iomap_begin( > } > > retry: > - error = xfs_bmapi_reserve_delalloc(ip, whichfork, offset_fsb, > + error = xfs_bmapi_reserve_delalloc(ip, allocfork, offset_fsb, > end_fsb - offset_fsb, prealloc_blocks, > - whichfork == XFS_DATA_FORK ? &imap : &cmap, > - whichfork == XFS_DATA_FORK ? &icur : &ccur, > - whichfork == XFS_DATA_FORK ? eof : cow_eof); > + allocfork == XFS_DATA_FORK ? &imap : &cmap, > + allocfork == XFS_DATA_FORK ? &icur : &ccur, > + allocfork == XFS_DATA_FORK ? eof : cow_eof); > switch (error) { > case 0: > break; > @@ -1027,8 +1027,8 @@ xfs_buffered_write_iomap_begin( > goto out_unlock; > } > > - if (whichfork == XFS_COW_FORK) { > - trace_xfs_iomap_alloc(ip, offset, count, whichfork, &cmap); > + if (allocfork == XFS_COW_FORK) { > + trace_xfs_iomap_alloc(ip, offset, count, allocfork, &cmap); > goto found_cow; > } > > @@ -1037,7 +1037,7 @@ xfs_buffered_write_iomap_begin( > * them out if the write happens to fail. > */ > xfs_iunlock(ip, XFS_ILOCK_EXCL); > - trace_xfs_iomap_alloc(ip, offset, count, whichfork, &imap); > + trace_xfs_iomap_alloc(ip, offset, count, allocfork, &imap); > return xfs_bmbt_to_iomap(ip, iomap, &imap, IOMAP_F_NEW); > > found_imap: >
On Mon, Sep 09, 2019 at 08:27:20PM +0200, Christoph Hellwig wrote: > Renaming whichfork to allocfork in xfs_buffered_write_iomap_begin makes > the usage of this variable a little more clear. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_iomap.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c > index 6dd143374d75..0e575ca1e3fc 100644 > --- a/fs/xfs/xfs_iomap.c > +++ b/fs/xfs/xfs_iomap.c > @@ -862,7 +862,7 @@ xfs_buffered_write_iomap_begin( > struct xfs_iext_cursor icur, ccur; > xfs_fsblock_t prealloc_blocks = 0; > bool eof = false, cow_eof = false, shared = false; > - int whichfork = XFS_DATA_FORK; > + int allocfork = XFS_DATA_FORK; > int error = 0; > > /* we can't use delayed allocations when using extent size hints */ > @@ -959,7 +959,7 @@ xfs_buffered_write_iomap_begin( > * Fork all the shared blocks from our write offset until the > * end of the extent. > */ > - whichfork = XFS_COW_FORK; > + allocfork = XFS_COW_FORK; > end_fsb = imap.br_startoff + imap.br_blockcount; > } else { > /* > @@ -975,7 +975,7 @@ xfs_buffered_write_iomap_begin( > end_fsb = xfs_iomap_end_fsb(mp, offset, count); > > if (xfs_is_always_cow_inode(ip)) > - whichfork = XFS_COW_FORK; > + allocfork = XFS_COW_FORK; > } > > error = xfs_qm_dqattach_locked(ip, false); > @@ -983,7 +983,7 @@ xfs_buffered_write_iomap_begin( > goto out_unlock; > > if (eof) { > - prealloc_blocks = xfs_iomap_prealloc_size(ip, whichfork, offset, > + prealloc_blocks = xfs_iomap_prealloc_size(ip, allocfork, offset, > count, &icur); > if (prealloc_blocks) { > xfs_extlen_t align; > @@ -1006,11 +1006,11 @@ xfs_buffered_write_iomap_begin( > } > > retry: > - error = xfs_bmapi_reserve_delalloc(ip, whichfork, offset_fsb, > + error = xfs_bmapi_reserve_delalloc(ip, allocfork, offset_fsb, > end_fsb - offset_fsb, prealloc_blocks, > - whichfork == XFS_DATA_FORK ? &imap : &cmap, > - whichfork == XFS_DATA_FORK ? &icur : &ccur, > - whichfork == XFS_DATA_FORK ? eof : cow_eof); > + allocfork == XFS_DATA_FORK ? &imap : &cmap, > + allocfork == XFS_DATA_FORK ? &icur : &ccur, > + allocfork == XFS_DATA_FORK ? eof : cow_eof); > switch (error) { > case 0: > break; > @@ -1027,8 +1027,8 @@ xfs_buffered_write_iomap_begin( > goto out_unlock; > } > > - if (whichfork == XFS_COW_FORK) { > - trace_xfs_iomap_alloc(ip, offset, count, whichfork, &cmap); > + if (allocfork == XFS_COW_FORK) { > + trace_xfs_iomap_alloc(ip, offset, count, allocfork, &cmap); > goto found_cow; > } > > @@ -1037,7 +1037,7 @@ xfs_buffered_write_iomap_begin( > * them out if the write happens to fail. > */ > xfs_iunlock(ip, XFS_ILOCK_EXCL); > - trace_xfs_iomap_alloc(ip, offset, count, whichfork, &imap); > + trace_xfs_iomap_alloc(ip, offset, count, allocfork, &imap); > return xfs_bmbt_to_iomap(ip, iomap, &imap, IOMAP_F_NEW); > > found_imap: > -- > 2.20.1 >
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 6dd143374d75..0e575ca1e3fc 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -862,7 +862,7 @@ xfs_buffered_write_iomap_begin( struct xfs_iext_cursor icur, ccur; xfs_fsblock_t prealloc_blocks = 0; bool eof = false, cow_eof = false, shared = false; - int whichfork = XFS_DATA_FORK; + int allocfork = XFS_DATA_FORK; int error = 0; /* we can't use delayed allocations when using extent size hints */ @@ -959,7 +959,7 @@ xfs_buffered_write_iomap_begin( * Fork all the shared blocks from our write offset until the * end of the extent. */ - whichfork = XFS_COW_FORK; + allocfork = XFS_COW_FORK; end_fsb = imap.br_startoff + imap.br_blockcount; } else { /* @@ -975,7 +975,7 @@ xfs_buffered_write_iomap_begin( end_fsb = xfs_iomap_end_fsb(mp, offset, count); if (xfs_is_always_cow_inode(ip)) - whichfork = XFS_COW_FORK; + allocfork = XFS_COW_FORK; } error = xfs_qm_dqattach_locked(ip, false); @@ -983,7 +983,7 @@ xfs_buffered_write_iomap_begin( goto out_unlock; if (eof) { - prealloc_blocks = xfs_iomap_prealloc_size(ip, whichfork, offset, + prealloc_blocks = xfs_iomap_prealloc_size(ip, allocfork, offset, count, &icur); if (prealloc_blocks) { xfs_extlen_t align; @@ -1006,11 +1006,11 @@ xfs_buffered_write_iomap_begin( } retry: - error = xfs_bmapi_reserve_delalloc(ip, whichfork, offset_fsb, + error = xfs_bmapi_reserve_delalloc(ip, allocfork, offset_fsb, end_fsb - offset_fsb, prealloc_blocks, - whichfork == XFS_DATA_FORK ? &imap : &cmap, - whichfork == XFS_DATA_FORK ? &icur : &ccur, - whichfork == XFS_DATA_FORK ? eof : cow_eof); + allocfork == XFS_DATA_FORK ? &imap : &cmap, + allocfork == XFS_DATA_FORK ? &icur : &ccur, + allocfork == XFS_DATA_FORK ? eof : cow_eof); switch (error) { case 0: break; @@ -1027,8 +1027,8 @@ xfs_buffered_write_iomap_begin( goto out_unlock; } - if (whichfork == XFS_COW_FORK) { - trace_xfs_iomap_alloc(ip, offset, count, whichfork, &cmap); + if (allocfork == XFS_COW_FORK) { + trace_xfs_iomap_alloc(ip, offset, count, allocfork, &cmap); goto found_cow; } @@ -1037,7 +1037,7 @@ xfs_buffered_write_iomap_begin( * them out if the write happens to fail. */ xfs_iunlock(ip, XFS_ILOCK_EXCL); - trace_xfs_iomap_alloc(ip, offset, count, whichfork, &imap); + trace_xfs_iomap_alloc(ip, offset, count, allocfork, &imap); return xfs_bmbt_to_iomap(ip, iomap, &imap, IOMAP_F_NEW); found_imap:
Renaming whichfork to allocfork in xfs_buffered_write_iomap_begin makes the usage of this variable a little more clear. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_iomap.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)