| Message ID | 1525627494-12873-10-git-send-email-allison.henderson@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Sun, May 06, 2018 at 10:24:42AM -0700, Allison Henderson wrote: > From: Mark Tinguely <tinguely@sgi.com> > > Return the directory offset information when removing an entry to the > directory. > > This offset will be used as the parent pointer offset in xfs_remove. > > [dchinner: forward ported and cleaned up] > [achender: rebased, changed __unint32_t to xfs_dir2_dataptr_t, > Changed typedefs to raw struct types] > > Signed-off-by: Mark Tinguely <tinguely@sgi.com> > Signed-off-by: Dave Chinner <dchinner@redhat.com> > Signed-off-by: Allison Henderson <allison.henderson@oracle.com> > --- > fs/xfs/libxfs/xfs_dir2.c | 16 ++++++++++------ > fs/xfs/libxfs/xfs_dir2.h | 4 +++- > fs/xfs/libxfs/xfs_dir2_block.c | 4 ++-- > fs/xfs/libxfs/xfs_dir2_leaf.c | 5 +++-- > fs/xfs/libxfs/xfs_dir2_node.c | 5 +++-- > fs/xfs/libxfs/xfs_dir2_sf.c | 2 ++ > fs/xfs/xfs_inode.c | 7 ++++--- > 7 files changed, 27 insertions(+), 16 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c > index 409a1e7..090ab0e 100644 > --- a/fs/xfs/libxfs/xfs_dir2.c > +++ b/fs/xfs/libxfs/xfs_dir2.c > @@ -433,13 +433,14 @@ xfs_dir_lookup( > */ > int > xfs_dir_removename( > - xfs_trans_t *tp, > - xfs_inode_t *dp, > - struct xfs_name *name, > - xfs_ino_t ino, > - xfs_fsblock_t *first, /* bmap's firstblock */ > + struct xfs_trans *tp, > + struct xfs_inode *dp, > + struct xfs_name *name, > + xfs_ino_t ino, > + xfs_fsblock_t *first, /* bmap's firstblock */ > struct xfs_defer_ops *dfops, /* bmap's freeblock list */ > - xfs_extlen_t total) /* bmap's total block count */ > + xfs_extlen_t total, /* bmap's total block count */ > + xfs_dir2_dataptr_t *offset) /* OUT: offset in directory */ > { > struct xfs_da_args *args; > int rval; > @@ -486,6 +487,9 @@ xfs_dir_removename( > else > rval = xfs_dir2_node_removename(args); > out_free: > + if (offset) > + *offset = args->offset; > + > kmem_free(args); > return rval; > } > diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h > index c98a3ca..b73bdcb 100644 > --- a/fs/xfs/libxfs/xfs_dir2.h > +++ b/fs/xfs/libxfs/xfs_dir2.h > @@ -139,7 +139,9 @@ extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp, > extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp, > struct xfs_name *name, xfs_ino_t ino, > xfs_fsblock_t *first, > - struct xfs_defer_ops *dfops, xfs_extlen_t tot); > + struct xfs_defer_ops *dfops, > + xfs_extlen_t tot, > + xfs_dir2_dataptr_t *offset); > extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp, > struct xfs_name *name, xfs_ino_t inum, > xfs_fsblock_t *first, > diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c > index 9b7f173..9c1e485 100644 > --- a/fs/xfs/libxfs/xfs_dir2_block.c > +++ b/fs/xfs/libxfs/xfs_dir2_block.c > @@ -798,9 +798,9 @@ xfs_dir2_block_removename( > /* > * Point to the data entry using the leaf entry. > */ > + args->offset = be32_to_cpu(blp[ent].address); > dep = (xfs_dir2_data_entry_t *)((char *)hdr + > - xfs_dir2_dataptr_to_off(args->geo, > - be32_to_cpu(blp[ent].address))); > + xfs_dir2_dataptr_to_off(args->geo, args->offset)); > /* > * Mark the data entry's space free. > */ > diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c > index 8ae2953..c5595c1 100644 > --- a/fs/xfs/libxfs/xfs_dir2_leaf.c > +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c > @@ -1414,9 +1414,10 @@ xfs_dir2_leaf_removename( > * Point to the leaf entry, use that to point to the data entry. > */ > lep = &ents[index]; > - db = xfs_dir2_dataptr_to_db(args->geo, be32_to_cpu(lep->address)); > + args->offset = be32_to_cpu(lep->address); > + db = xfs_dir2_dataptr_to_db(args->geo, args->offset); > dep = (xfs_dir2_data_entry_t *)((char *)hdr + > - xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address))); > + xfs_dir2_dataptr_to_off(args->geo, args->offset)); > needscan = needlog = 0; > oldbest = be16_to_cpu(bf[0].length); > ltp = xfs_dir2_leaf_tail_p(args->geo, leaf); > diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c > index 4e544f7..eb8b240 100644 > --- a/fs/xfs/libxfs/xfs_dir2_node.c > +++ b/fs/xfs/libxfs/xfs_dir2_node.c > @@ -1252,9 +1252,10 @@ xfs_dir2_leafn_remove( > /* > * Extract the data block and offset from the entry. > */ > - db = xfs_dir2_dataptr_to_db(args->geo, be32_to_cpu(lep->address)); > + args->offset = be32_to_cpu(lep->address); > + db = xfs_dir2_dataptr_to_db(args->geo, args->offset); > ASSERT(dblk->blkno == db); > - off = xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address)); > + off = xfs_dir2_dataptr_to_off(args->geo, args->offset); > ASSERT(dblk->index == off); > > /* > diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c > index 222ccf5..1d0957c 100644 > --- a/fs/xfs/libxfs/xfs_dir2_sf.c > +++ b/fs/xfs/libxfs/xfs_dir2_sf.c > @@ -917,6 +917,8 @@ xfs_dir2_sf_removename( > XFS_CMP_EXACT) { > ASSERT(dp->d_ops->sf_get_ino(sfp, sfep) == > args->inumber); > + args->offset = xfs_dir2_byte_to_dataptr( > + xfs_dir2_sf_get_offset(sfep)); > break; > } > } > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c > index fc07b4f..3054e9a 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -2648,8 +2648,8 @@ xfs_remove( > goto out_trans_cancel; > > xfs_defer_init(&dfops, &first_block); > - error = xfs_dir_removename(tp, dp, name, ip->i_ino, > - &first_block, &dfops, resblks); > + error = xfs_dir_removename(tp, dp, name, ip->i_ino, &first_block, > + &dfops, resblks, NULL); > if (error) { > ASSERT(error != -ENOENT); > goto out_bmap_cancel; > @@ -3159,7 +3159,8 @@ xfs_rename( > &first_block, &dfops, spaceres); > } else > error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino, > - &first_block, &dfops, spaceres); > + &first_block, &dfops, spaceres, > + NULL); Two indents for the second & third lines, please. Otherwise looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > if (error) > goto out_bmap_cancel; > > -- > 2.7.4 > > -- > 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
On 05/07/2018 03:48 PM, Darrick J. Wong wrote: > On Sun, May 06, 2018 at 10:24:42AM -0700, Allison Henderson wrote: >> From: Mark Tinguely <tinguely@sgi.com> >> >> Return the directory offset information when removing an entry to the >> directory. >> >> This offset will be used as the parent pointer offset in xfs_remove. >> >> [dchinner: forward ported and cleaned up] >> [achender: rebased, changed __unint32_t to xfs_dir2_dataptr_t, >> Changed typedefs to raw struct types] >> >> Signed-off-by: Mark Tinguely <tinguely@sgi.com> >> Signed-off-by: Dave Chinner <dchinner@redhat.com> >> Signed-off-by: Allison Henderson <allison.henderson@oracle.com> >> --- >> fs/xfs/libxfs/xfs_dir2.c | 16 ++++++++++------ >> fs/xfs/libxfs/xfs_dir2.h | 4 +++- >> fs/xfs/libxfs/xfs_dir2_block.c | 4 ++-- >> fs/xfs/libxfs/xfs_dir2_leaf.c | 5 +++-- >> fs/xfs/libxfs/xfs_dir2_node.c | 5 +++-- >> fs/xfs/libxfs/xfs_dir2_sf.c | 2 ++ >> fs/xfs/xfs_inode.c | 7 ++++--- >> 7 files changed, 27 insertions(+), 16 deletions(-) >> >> diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c >> index 409a1e7..090ab0e 100644 >> --- a/fs/xfs/libxfs/xfs_dir2.c >> +++ b/fs/xfs/libxfs/xfs_dir2.c >> @@ -433,13 +433,14 @@ xfs_dir_lookup( >> */ >> int >> xfs_dir_removename( >> - xfs_trans_t *tp, >> - xfs_inode_t *dp, >> - struct xfs_name *name, >> - xfs_ino_t ino, >> - xfs_fsblock_t *first, /* bmap's firstblock */ >> + struct xfs_trans *tp, >> + struct xfs_inode *dp, >> + struct xfs_name *name, >> + xfs_ino_t ino, >> + xfs_fsblock_t *first, /* bmap's firstblock */ >> struct xfs_defer_ops *dfops, /* bmap's freeblock list */ >> - xfs_extlen_t total) /* bmap's total block count */ >> + xfs_extlen_t total, /* bmap's total block count */ >> + xfs_dir2_dataptr_t *offset) /* OUT: offset in directory */ >> { >> struct xfs_da_args *args; >> int rval; >> @@ -486,6 +487,9 @@ xfs_dir_removename( >> else >> rval = xfs_dir2_node_removename(args); >> out_free: >> + if (offset) >> + *offset = args->offset; >> + >> kmem_free(args); >> return rval; >> } >> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h >> index c98a3ca..b73bdcb 100644 >> --- a/fs/xfs/libxfs/xfs_dir2.h >> +++ b/fs/xfs/libxfs/xfs_dir2.h >> @@ -139,7 +139,9 @@ extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp, >> extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp, >> struct xfs_name *name, xfs_ino_t ino, >> xfs_fsblock_t *first, >> - struct xfs_defer_ops *dfops, xfs_extlen_t tot); >> + struct xfs_defer_ops *dfops, >> + xfs_extlen_t tot, >> + xfs_dir2_dataptr_t *offset); >> extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp, >> struct xfs_name *name, xfs_ino_t inum, >> xfs_fsblock_t *first, >> diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c >> index 9b7f173..9c1e485 100644 >> --- a/fs/xfs/libxfs/xfs_dir2_block.c >> +++ b/fs/xfs/libxfs/xfs_dir2_block.c >> @@ -798,9 +798,9 @@ xfs_dir2_block_removename( >> /* >> * Point to the data entry using the leaf entry. >> */ >> + args->offset = be32_to_cpu(blp[ent].address); >> dep = (xfs_dir2_data_entry_t *)((char *)hdr + >> - xfs_dir2_dataptr_to_off(args->geo, >> - be32_to_cpu(blp[ent].address))); >> + xfs_dir2_dataptr_to_off(args->geo, args->offset)); >> /* >> * Mark the data entry's space free. >> */ >> diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c >> index 8ae2953..c5595c1 100644 >> --- a/fs/xfs/libxfs/xfs_dir2_leaf.c >> +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c >> @@ -1414,9 +1414,10 @@ xfs_dir2_leaf_removename( >> * Point to the leaf entry, use that to point to the data entry. >> */ >> lep = &ents[index]; >> - db = xfs_dir2_dataptr_to_db(args->geo, be32_to_cpu(lep->address)); >> + args->offset = be32_to_cpu(lep->address); >> + db = xfs_dir2_dataptr_to_db(args->geo, args->offset); >> dep = (xfs_dir2_data_entry_t *)((char *)hdr + >> - xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address))); >> + xfs_dir2_dataptr_to_off(args->geo, args->offset)); >> needscan = needlog = 0; >> oldbest = be16_to_cpu(bf[0].length); >> ltp = xfs_dir2_leaf_tail_p(args->geo, leaf); >> diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c >> index 4e544f7..eb8b240 100644 >> --- a/fs/xfs/libxfs/xfs_dir2_node.c >> +++ b/fs/xfs/libxfs/xfs_dir2_node.c >> @@ -1252,9 +1252,10 @@ xfs_dir2_leafn_remove( >> /* >> * Extract the data block and offset from the entry. >> */ >> - db = xfs_dir2_dataptr_to_db(args->geo, be32_to_cpu(lep->address)); >> + args->offset = be32_to_cpu(lep->address); >> + db = xfs_dir2_dataptr_to_db(args->geo, args->offset); >> ASSERT(dblk->blkno == db); >> - off = xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address)); >> + off = xfs_dir2_dataptr_to_off(args->geo, args->offset); >> ASSERT(dblk->index == off); >> >> /* >> diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c >> index 222ccf5..1d0957c 100644 >> --- a/fs/xfs/libxfs/xfs_dir2_sf.c >> +++ b/fs/xfs/libxfs/xfs_dir2_sf.c >> @@ -917,6 +917,8 @@ xfs_dir2_sf_removename( >> XFS_CMP_EXACT) { >> ASSERT(dp->d_ops->sf_get_ino(sfp, sfep) == >> args->inumber); >> + args->offset = xfs_dir2_byte_to_dataptr( >> + xfs_dir2_sf_get_offset(sfep)); >> break; >> } >> } >> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c >> index fc07b4f..3054e9a 100644 >> --- a/fs/xfs/xfs_inode.c >> +++ b/fs/xfs/xfs_inode.c >> @@ -2648,8 +2648,8 @@ xfs_remove( >> goto out_trans_cancel; >> >> xfs_defer_init(&dfops, &first_block); >> - error = xfs_dir_removename(tp, dp, name, ip->i_ino, >> - &first_block, &dfops, resblks); >> + error = xfs_dir_removename(tp, dp, name, ip->i_ino, &first_block, >> + &dfops, resblks, NULL); >> if (error) { >> ASSERT(error != -ENOENT); >> goto out_bmap_cancel; >> @@ -3159,7 +3159,8 @@ xfs_rename( >> &first_block, &dfops, spaceres); >> } else >> error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino, >> - &first_block, &dfops, spaceres); >> + &first_block, &dfops, spaceres, >> + NULL); > > Two indents for the second & third lines, please. > > Otherwise looks ok, > Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> > > --D Alrighty, thx! Allison > >> if (error) >> goto out_bmap_cancel; >> >> -- >> 2.7.4 >> >> -- >> 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_dir2.c b/fs/xfs/libxfs/xfs_dir2.c index 409a1e7..090ab0e 100644 --- a/fs/xfs/libxfs/xfs_dir2.c +++ b/fs/xfs/libxfs/xfs_dir2.c @@ -433,13 +433,14 @@ xfs_dir_lookup( */ int xfs_dir_removename( - xfs_trans_t *tp, - xfs_inode_t *dp, - struct xfs_name *name, - xfs_ino_t ino, - xfs_fsblock_t *first, /* bmap's firstblock */ + struct xfs_trans *tp, + struct xfs_inode *dp, + struct xfs_name *name, + xfs_ino_t ino, + xfs_fsblock_t *first, /* bmap's firstblock */ struct xfs_defer_ops *dfops, /* bmap's freeblock list */ - xfs_extlen_t total) /* bmap's total block count */ + xfs_extlen_t total, /* bmap's total block count */ + xfs_dir2_dataptr_t *offset) /* OUT: offset in directory */ { struct xfs_da_args *args; int rval; @@ -486,6 +487,9 @@ xfs_dir_removename( else rval = xfs_dir2_node_removename(args); out_free: + if (offset) + *offset = args->offset; + kmem_free(args); return rval; } diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h index c98a3ca..b73bdcb 100644 --- a/fs/xfs/libxfs/xfs_dir2.h +++ b/fs/xfs/libxfs/xfs_dir2.h @@ -139,7 +139,9 @@ extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp, extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_name *name, xfs_ino_t ino, xfs_fsblock_t *first, - struct xfs_defer_ops *dfops, xfs_extlen_t tot); + struct xfs_defer_ops *dfops, + xfs_extlen_t tot, + xfs_dir2_dataptr_t *offset); extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_name *name, xfs_ino_t inum, xfs_fsblock_t *first, diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c index 9b7f173..9c1e485 100644 --- a/fs/xfs/libxfs/xfs_dir2_block.c +++ b/fs/xfs/libxfs/xfs_dir2_block.c @@ -798,9 +798,9 @@ xfs_dir2_block_removename( /* * Point to the data entry using the leaf entry. */ + args->offset = be32_to_cpu(blp[ent].address); dep = (xfs_dir2_data_entry_t *)((char *)hdr + - xfs_dir2_dataptr_to_off(args->geo, - be32_to_cpu(blp[ent].address))); + xfs_dir2_dataptr_to_off(args->geo, args->offset)); /* * Mark the data entry's space free. */ diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c index 8ae2953..c5595c1 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c @@ -1414,9 +1414,10 @@ xfs_dir2_leaf_removename( * Point to the leaf entry, use that to point to the data entry. */ lep = &ents[index]; - db = xfs_dir2_dataptr_to_db(args->geo, be32_to_cpu(lep->address)); + args->offset = be32_to_cpu(lep->address); + db = xfs_dir2_dataptr_to_db(args->geo, args->offset); dep = (xfs_dir2_data_entry_t *)((char *)hdr + - xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address))); + xfs_dir2_dataptr_to_off(args->geo, args->offset)); needscan = needlog = 0; oldbest = be16_to_cpu(bf[0].length); ltp = xfs_dir2_leaf_tail_p(args->geo, leaf); diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index 4e544f7..eb8b240 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -1252,9 +1252,10 @@ xfs_dir2_leafn_remove( /* * Extract the data block and offset from the entry. */ - db = xfs_dir2_dataptr_to_db(args->geo, be32_to_cpu(lep->address)); + args->offset = be32_to_cpu(lep->address); + db = xfs_dir2_dataptr_to_db(args->geo, args->offset); ASSERT(dblk->blkno == db); - off = xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address)); + off = xfs_dir2_dataptr_to_off(args->geo, args->offset); ASSERT(dblk->index == off); /* diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c index 222ccf5..1d0957c 100644 --- a/fs/xfs/libxfs/xfs_dir2_sf.c +++ b/fs/xfs/libxfs/xfs_dir2_sf.c @@ -917,6 +917,8 @@ xfs_dir2_sf_removename( XFS_CMP_EXACT) { ASSERT(dp->d_ops->sf_get_ino(sfp, sfep) == args->inumber); + args->offset = xfs_dir2_byte_to_dataptr( + xfs_dir2_sf_get_offset(sfep)); break; } } diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index fc07b4f..3054e9a 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2648,8 +2648,8 @@ xfs_remove( goto out_trans_cancel; xfs_defer_init(&dfops, &first_block); - error = xfs_dir_removename(tp, dp, name, ip->i_ino, - &first_block, &dfops, resblks); + error = xfs_dir_removename(tp, dp, name, ip->i_ino, &first_block, + &dfops, resblks, NULL); if (error) { ASSERT(error != -ENOENT); goto out_bmap_cancel; @@ -3159,7 +3159,8 @@ xfs_rename( &first_block, &dfops, spaceres); } else error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino, - &first_block, &dfops, spaceres); + &first_block, &dfops, spaceres, + NULL); if (error) goto out_bmap_cancel;