| Message ID | 20200224040044.30923-2-chandanrlinux@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix log reservation calculation for xattr insert operation | expand |
On Mon, Feb 24, 2020 at 09:30:38AM +0530, Chandan Rajendra wrote: > This commit changes xfs_attr_leaf_newentsize() to explicitly accept name and > value length instead of a pointer to struct xfs_da_args. A future commit will > need to invoke xfs_attr_leaf_newentsize() from functions that do not have > a struct xfs_da_args to pass in. > > Signed-off-by: Chandan Rajendra <chandanrlinux@gmail.com> > --- Reviewed-by: Brian Foster <bfoster@redhat.com> > fs/xfs/libxfs/xfs_attr.c | 3 ++- > fs/xfs/libxfs/xfs_attr_leaf.c | 39 +++++++++++++++++++++++------------ > fs/xfs/libxfs/xfs_attr_leaf.h | 3 ++- > 3 files changed, 30 insertions(+), 15 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index 23e0d8ce39f8c..1875210cc8e40 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -149,7 +149,8 @@ xfs_attr_calc_size( > * Determine space new attribute will use, and if it would be > * "local" or "remote" (note: local != inline). > */ > - size = xfs_attr_leaf_newentsize(args, local); > + size = xfs_attr_leaf_newentsize(args->geo, args->namelen, > + args->valuelen, local); > nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK); > if (*local) { > if (size > (args->geo->blksize / 2)) { > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index fae322105457a..65a3bf40c4f9d 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -1330,7 +1330,8 @@ xfs_attr3_leaf_add( > leaf = bp->b_addr; > xfs_attr3_leaf_hdr_from_disk(args->geo, &ichdr, leaf); > ASSERT(args->index >= 0 && args->index <= ichdr.count); > - entsize = xfs_attr_leaf_newentsize(args, NULL); > + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, > + args->valuelen, NULL); > > /* > * Search through freemap for first-fit on new name length. > @@ -1403,6 +1404,7 @@ xfs_attr3_leaf_add_work( > struct xfs_attr_leaf_name_local *name_loc; > struct xfs_attr_leaf_name_remote *name_rmt; > struct xfs_mount *mp; > + int entsize; > int tmp; > int i; > > @@ -1432,11 +1434,14 @@ xfs_attr3_leaf_add_work( > ASSERT(ichdr->freemap[mapindex].base < args->geo->blksize); > ASSERT((ichdr->freemap[mapindex].base & 0x3) == 0); > ASSERT(ichdr->freemap[mapindex].size >= > - xfs_attr_leaf_newentsize(args, NULL)); > + xfs_attr_leaf_newentsize(args->geo, args->namelen, > + args->valuelen, NULL)); > ASSERT(ichdr->freemap[mapindex].size < args->geo->blksize); > ASSERT((ichdr->freemap[mapindex].size & 0x3) == 0); > > - ichdr->freemap[mapindex].size -= xfs_attr_leaf_newentsize(args, &tmp); > + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, > + args->valuelen, &tmp); > + ichdr->freemap[mapindex].size -= entsize; > > entry->nameidx = cpu_to_be16(ichdr->freemap[mapindex].base + > ichdr->freemap[mapindex].size); > @@ -1824,6 +1829,8 @@ xfs_attr3_leaf_figure_balance( > struct xfs_attr_leafblock *leaf1 = blk1->bp->b_addr; > struct xfs_attr_leafblock *leaf2 = blk2->bp->b_addr; > struct xfs_attr_leaf_entry *entry; > + struct xfs_da_args *args; > + int entsize; > int count; > int max; > int index; > @@ -1833,14 +1840,16 @@ xfs_attr3_leaf_figure_balance( > int foundit = 0; > int tmp; > > + args = state->args; > /* > * Examine entries until we reduce the absolute difference in > * byte usage between the two blocks to a minimum. > */ > max = ichdr1->count + ichdr2->count; > half = (max + 1) * sizeof(*entry); > - half += ichdr1->usedbytes + ichdr2->usedbytes + > - xfs_attr_leaf_newentsize(state->args, NULL); > + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, > + args->valuelen, NULL); > + half += ichdr1->usedbytes + ichdr2->usedbytes + entsize; > half /= 2; > lastdelta = state->args->geo->blksize; > entry = xfs_attr3_leaf_entryp(leaf1); > @@ -1851,8 +1860,9 @@ xfs_attr3_leaf_figure_balance( > * The new entry is in the first block, account for it. > */ > if (count == blk1->index) { > - tmp = totallen + sizeof(*entry) + > - xfs_attr_leaf_newentsize(state->args, NULL); > + entsize = xfs_attr_leaf_newentsize(args->geo, > + args->namelen, args->valuelen, NULL); > + tmp = totallen + sizeof(*entry) + entsize; > if (XFS_ATTR_ABS(half - tmp) > lastdelta) > break; > lastdelta = XFS_ATTR_ABS(half - tmp); > @@ -1887,8 +1897,9 @@ xfs_attr3_leaf_figure_balance( > */ > totallen -= count * sizeof(*entry); > if (foundit) { > - totallen -= sizeof(*entry) + > - xfs_attr_leaf_newentsize(state->args, NULL); > + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, > + args->valuelen, NULL); > + totallen -= sizeof(*entry) + entsize; > } > > *countarg = count; > @@ -2664,20 +2675,22 @@ xfs_attr_leaf_entsize(xfs_attr_leafblock_t *leaf, int index) > */ > int > xfs_attr_leaf_newentsize( > - struct xfs_da_args *args, > + struct xfs_da_geometry *geo, > + int namelen, > + int valuelen, > int *local) > { > int size; > > - size = xfs_attr_leaf_entsize_local(args->namelen, args->valuelen); > - if (size < xfs_attr_leaf_entsize_local_max(args->geo->blksize)) { > + size = xfs_attr_leaf_entsize_local(namelen, valuelen); > + if (size < xfs_attr_leaf_entsize_local_max(geo->blksize)) { > if (local) > *local = 1; > return size; > } > if (local) > *local = 0; > - return xfs_attr_leaf_entsize_remote(args->namelen); > + return xfs_attr_leaf_entsize_remote(namelen); > } > > > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h > index 6dd2d937a42a3..7bc5dd6c4d66a 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.h > +++ b/fs/xfs/libxfs/xfs_attr_leaf.h > @@ -96,7 +96,8 @@ void xfs_attr3_leaf_unbalance(struct xfs_da_state *state, > xfs_dahash_t xfs_attr_leaf_lasthash(struct xfs_buf *bp, int *count); > int xfs_attr_leaf_order(struct xfs_buf *leaf1_bp, > struct xfs_buf *leaf2_bp); > -int xfs_attr_leaf_newentsize(struct xfs_da_args *args, int *local); > +int xfs_attr_leaf_newentsize(struct xfs_da_geometry *geo, int namelen, > + int valuelen, int *local); > int xfs_attr3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp, > xfs_dablk_t bno, struct xfs_buf **bpp); > void xfs_attr3_leaf_hdr_from_disk(struct xfs_da_geometry *geo, > -- > 2.19.1 >
> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index fae322105457a..65a3bf40c4f9d 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -1403,6 +1404,7 @@ xfs_attr3_leaf_add_work( > struct xfs_attr_leaf_name_local *name_loc; > struct xfs_attr_leaf_name_remote *name_rmt; > struct xfs_mount *mp; > + int entsize; > int tmp; > int i; > > @@ -1432,11 +1434,14 @@ xfs_attr3_leaf_add_work( > ASSERT(ichdr->freemap[mapindex].base < args->geo->blksize); > ASSERT((ichdr->freemap[mapindex].base & 0x3) == 0); > ASSERT(ichdr->freemap[mapindex].size >= > - xfs_attr_leaf_newentsize(args, NULL)); > + xfs_attr_leaf_newentsize(args->geo, args->namelen, > + args->valuelen, NULL)); > ASSERT(ichdr->freemap[mapindex].size < args->geo->blksize); > ASSERT((ichdr->freemap[mapindex].size & 0x3) == 0); > > - ichdr->freemap[mapindex].size -= xfs_attr_leaf_newentsize(args, &tmp); > + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, > + args->valuelen, &tmp); > + ichdr->freemap[mapindex].size -= entsize; As-is this entsize variable is a little pointless. Please move the assignment to it up and reuse it in the assert. > @@ -1824,6 +1829,8 @@ xfs_attr3_leaf_figure_balance( > struct xfs_attr_leafblock *leaf1 = blk1->bp->b_addr; > struct xfs_attr_leafblock *leaf2 = blk2->bp->b_addr; > struct xfs_attr_leaf_entry *entry; > + struct xfs_da_args *args; > + int entsize; > int count; > int max; > int index; > @@ -1833,14 +1840,16 @@ xfs_attr3_leaf_figure_balance( > int foundit = 0; > int tmp; > > + args = state->args; Please assign the value to the variable at the time of declaration. > /* > * Examine entries until we reduce the absolute difference in > * byte usage between the two blocks to a minimum. > */ > max = ichdr1->count + ichdr2->count; > half = (max + 1) * sizeof(*entry); > - half += ichdr1->usedbytes + ichdr2->usedbytes + > - xfs_attr_leaf_newentsize(state->args, NULL); > + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, > + args->valuelen, NULL); > + half += ichdr1->usedbytes + ichdr2->usedbytes + entsize; > half /= 2; > lastdelta = state->args->geo->blksize; > entry = xfs_attr3_leaf_entryp(leaf1); > @@ -1851,8 +1860,9 @@ xfs_attr3_leaf_figure_balance( > * The new entry is in the first block, account for it. > */ > if (count == blk1->index) { > - tmp = totallen + sizeof(*entry) + > - xfs_attr_leaf_newentsize(state->args, NULL); > + entsize = xfs_attr_leaf_newentsize(args->geo, > + args->namelen, args->valuelen, NULL); > + tmp = totallen + sizeof(*entry) + entsize; > if (XFS_ATTR_ABS(half - tmp) > lastdelta) > break; > lastdelta = XFS_ATTR_ABS(half - tmp); > @@ -1887,8 +1897,9 @@ xfs_attr3_leaf_figure_balance( > */ > totallen -= count * sizeof(*entry); > if (foundit) { > - totallen -= sizeof(*entry) + > - xfs_attr_leaf_newentsize(state->args, NULL); > + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, > + args->valuelen, NULL); > + totallen -= sizeof(*entry) + entsize; AFAICS there is no need to assign the same value to entsize again and again in this function. It should be enough to assign to it once and then reuse the value.
On Wednesday, February 26, 2020 10:28 PM Christoph Hellwig wrote: > > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > > index fae322105457a..65a3bf40c4f9d 100644 > > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > > @@ -1403,6 +1404,7 @@ xfs_attr3_leaf_add_work( > > struct xfs_attr_leaf_name_local *name_loc; > > struct xfs_attr_leaf_name_remote *name_rmt; > > struct xfs_mount *mp; > > + int entsize; > > int tmp; > > int i; > > > > @@ -1432,11 +1434,14 @@ xfs_attr3_leaf_add_work( > > ASSERT(ichdr->freemap[mapindex].base < args->geo->blksize); > > ASSERT((ichdr->freemap[mapindex].base & 0x3) == 0); > > ASSERT(ichdr->freemap[mapindex].size >= > > - xfs_attr_leaf_newentsize(args, NULL)); > > + xfs_attr_leaf_newentsize(args->geo, args->namelen, > > + args->valuelen, NULL)); > > ASSERT(ichdr->freemap[mapindex].size < args->geo->blksize); > > ASSERT((ichdr->freemap[mapindex].size & 0x3) == 0); > > > > - ichdr->freemap[mapindex].size -= xfs_attr_leaf_newentsize(args, &tmp); > > + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, > > + args->valuelen, &tmp); > > + ichdr->freemap[mapindex].size -= entsize; > > As-is this entsize variable is a little pointless. Please move the > assignment to it up and reuse it in the assert. > > > @@ -1824,6 +1829,8 @@ xfs_attr3_leaf_figure_balance( > > struct xfs_attr_leafblock *leaf1 = blk1->bp->b_addr; > > struct xfs_attr_leafblock *leaf2 = blk2->bp->b_addr; > > struct xfs_attr_leaf_entry *entry; > > + struct xfs_da_args *args; > > + int entsize; > > int count; > > int max; > > int index; > > @@ -1833,14 +1840,16 @@ xfs_attr3_leaf_figure_balance( > > int foundit = 0; > > int tmp; > > > > + args = state->args; > > Please assign the value to the variable at the time of declaration. > > > /* > > * Examine entries until we reduce the absolute difference in > > * byte usage between the two blocks to a minimum. > > */ > > max = ichdr1->count + ichdr2->count; > > half = (max + 1) * sizeof(*entry); > > - half += ichdr1->usedbytes + ichdr2->usedbytes + > > - xfs_attr_leaf_newentsize(state->args, NULL); > > + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, > > + args->valuelen, NULL); > > + half += ichdr1->usedbytes + ichdr2->usedbytes + entsize; > > half /= 2; > > lastdelta = state->args->geo->blksize; > > entry = xfs_attr3_leaf_entryp(leaf1); > > @@ -1851,8 +1860,9 @@ xfs_attr3_leaf_figure_balance( > > * The new entry is in the first block, account for it. > > */ > > if (count == blk1->index) { > > - tmp = totallen + sizeof(*entry) + > > - xfs_attr_leaf_newentsize(state->args, NULL); > > + entsize = xfs_attr_leaf_newentsize(args->geo, > > + args->namelen, args->valuelen, NULL); > > + tmp = totallen + sizeof(*entry) + entsize; > > if (XFS_ATTR_ABS(half - tmp) > lastdelta) > > break; > > lastdelta = XFS_ATTR_ABS(half - tmp); > > @@ -1887,8 +1897,9 @@ xfs_attr3_leaf_figure_balance( > > */ > > totallen -= count * sizeof(*entry); > > if (foundit) { > > - totallen -= sizeof(*entry) + > > - xfs_attr_leaf_newentsize(state->args, NULL); > > + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, > > + args->valuelen, NULL); > > + totallen -= sizeof(*entry) + entsize; > > AFAICS there is no need to assign the same value to entsize again and > again in this function. It should be enough to assign to it once and > then reuse the value. > Sorry about those redundant function calls. I will include the changes suggested in the next version of the patchset.
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 23e0d8ce39f8c..1875210cc8e40 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -149,7 +149,8 @@ xfs_attr_calc_size( * Determine space new attribute will use, and if it would be * "local" or "remote" (note: local != inline). */ - size = xfs_attr_leaf_newentsize(args, local); + size = xfs_attr_leaf_newentsize(args->geo, args->namelen, + args->valuelen, local); nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK); if (*local) { if (size > (args->geo->blksize / 2)) { diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index fae322105457a..65a3bf40c4f9d 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -1330,7 +1330,8 @@ xfs_attr3_leaf_add( leaf = bp->b_addr; xfs_attr3_leaf_hdr_from_disk(args->geo, &ichdr, leaf); ASSERT(args->index >= 0 && args->index <= ichdr.count); - entsize = xfs_attr_leaf_newentsize(args, NULL); + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, + args->valuelen, NULL); /* * Search through freemap for first-fit on new name length. @@ -1403,6 +1404,7 @@ xfs_attr3_leaf_add_work( struct xfs_attr_leaf_name_local *name_loc; struct xfs_attr_leaf_name_remote *name_rmt; struct xfs_mount *mp; + int entsize; int tmp; int i; @@ -1432,11 +1434,14 @@ xfs_attr3_leaf_add_work( ASSERT(ichdr->freemap[mapindex].base < args->geo->blksize); ASSERT((ichdr->freemap[mapindex].base & 0x3) == 0); ASSERT(ichdr->freemap[mapindex].size >= - xfs_attr_leaf_newentsize(args, NULL)); + xfs_attr_leaf_newentsize(args->geo, args->namelen, + args->valuelen, NULL)); ASSERT(ichdr->freemap[mapindex].size < args->geo->blksize); ASSERT((ichdr->freemap[mapindex].size & 0x3) == 0); - ichdr->freemap[mapindex].size -= xfs_attr_leaf_newentsize(args, &tmp); + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, + args->valuelen, &tmp); + ichdr->freemap[mapindex].size -= entsize; entry->nameidx = cpu_to_be16(ichdr->freemap[mapindex].base + ichdr->freemap[mapindex].size); @@ -1824,6 +1829,8 @@ xfs_attr3_leaf_figure_balance( struct xfs_attr_leafblock *leaf1 = blk1->bp->b_addr; struct xfs_attr_leafblock *leaf2 = blk2->bp->b_addr; struct xfs_attr_leaf_entry *entry; + struct xfs_da_args *args; + int entsize; int count; int max; int index; @@ -1833,14 +1840,16 @@ xfs_attr3_leaf_figure_balance( int foundit = 0; int tmp; + args = state->args; /* * Examine entries until we reduce the absolute difference in * byte usage between the two blocks to a minimum. */ max = ichdr1->count + ichdr2->count; half = (max + 1) * sizeof(*entry); - half += ichdr1->usedbytes + ichdr2->usedbytes + - xfs_attr_leaf_newentsize(state->args, NULL); + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, + args->valuelen, NULL); + half += ichdr1->usedbytes + ichdr2->usedbytes + entsize; half /= 2; lastdelta = state->args->geo->blksize; entry = xfs_attr3_leaf_entryp(leaf1); @@ -1851,8 +1860,9 @@ xfs_attr3_leaf_figure_balance( * The new entry is in the first block, account for it. */ if (count == blk1->index) { - tmp = totallen + sizeof(*entry) + - xfs_attr_leaf_newentsize(state->args, NULL); + entsize = xfs_attr_leaf_newentsize(args->geo, + args->namelen, args->valuelen, NULL); + tmp = totallen + sizeof(*entry) + entsize; if (XFS_ATTR_ABS(half - tmp) > lastdelta) break; lastdelta = XFS_ATTR_ABS(half - tmp); @@ -1887,8 +1897,9 @@ xfs_attr3_leaf_figure_balance( */ totallen -= count * sizeof(*entry); if (foundit) { - totallen -= sizeof(*entry) + - xfs_attr_leaf_newentsize(state->args, NULL); + entsize = xfs_attr_leaf_newentsize(args->geo, args->namelen, + args->valuelen, NULL); + totallen -= sizeof(*entry) + entsize; } *countarg = count; @@ -2664,20 +2675,22 @@ xfs_attr_leaf_entsize(xfs_attr_leafblock_t *leaf, int index) */ int xfs_attr_leaf_newentsize( - struct xfs_da_args *args, + struct xfs_da_geometry *geo, + int namelen, + int valuelen, int *local) { int size; - size = xfs_attr_leaf_entsize_local(args->namelen, args->valuelen); - if (size < xfs_attr_leaf_entsize_local_max(args->geo->blksize)) { + size = xfs_attr_leaf_entsize_local(namelen, valuelen); + if (size < xfs_attr_leaf_entsize_local_max(geo->blksize)) { if (local) *local = 1; return size; } if (local) *local = 0; - return xfs_attr_leaf_entsize_remote(args->namelen); + return xfs_attr_leaf_entsize_remote(namelen); } diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h index 6dd2d937a42a3..7bc5dd6c4d66a 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.h +++ b/fs/xfs/libxfs/xfs_attr_leaf.h @@ -96,7 +96,8 @@ void xfs_attr3_leaf_unbalance(struct xfs_da_state *state, xfs_dahash_t xfs_attr_leaf_lasthash(struct xfs_buf *bp, int *count); int xfs_attr_leaf_order(struct xfs_buf *leaf1_bp, struct xfs_buf *leaf2_bp); -int xfs_attr_leaf_newentsize(struct xfs_da_args *args, int *local); +int xfs_attr_leaf_newentsize(struct xfs_da_geometry *geo, int namelen, + int valuelen, int *local); int xfs_attr3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp, xfs_dablk_t bno, struct xfs_buf **bpp); void xfs_attr3_leaf_hdr_from_disk(struct xfs_da_geometry *geo,
This commit changes xfs_attr_leaf_newentsize() to explicitly accept name and value length instead of a pointer to struct xfs_da_args. A future commit will need to invoke xfs_attr_leaf_newentsize() from functions that do not have a struct xfs_da_args to pass in. Signed-off-by: Chandan Rajendra <chandanrlinux@gmail.com> --- fs/xfs/libxfs/xfs_attr.c | 3 ++- fs/xfs/libxfs/xfs_attr_leaf.c | 39 +++++++++++++++++++++++------------ fs/xfs/libxfs/xfs_attr_leaf.h | 3 ++- 3 files changed, 30 insertions(+), 15 deletions(-)