| Message ID | 20220611094200.129502-5-allison.henderson@oracle.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | Return of the Parent Pointers | expand |
On Sat, Jun 11, 2022 at 02:41:47AM -0700, Allison Henderson wrote: > 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> > Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/xfs/libxfs/xfs_dir2.c | 6 +++++- > fs/xfs/libxfs/xfs_dir2.h | 3 ++- > 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 | 4 ++-- > 7 files changed, 19 insertions(+), 10 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c > index f7f7fa79593f..c3fa1bd1c370 100644 > --- a/fs/xfs/libxfs/xfs_dir2.c > +++ b/fs/xfs/libxfs/xfs_dir2.c > @@ -436,7 +436,8 @@ xfs_dir_removename( > struct xfs_inode *dp, > struct xfs_name *name, > xfs_ino_t ino, > - 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; > @@ -481,6 +482,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 4d1c2570b833..c581d3b19bc6 100644 > --- a/fs/xfs/libxfs/xfs_dir2.h > +++ b/fs/xfs/libxfs/xfs_dir2.h > @@ -46,7 +46,8 @@ extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp, > struct xfs_name *ci_name); > extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp, > struct xfs_name *name, xfs_ino_t ino, > - xfs_extlen_t tot); > + xfs_extlen_t tot, > + xfs_dir2_dataptr_t *offset); > extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp, > const struct xfs_name *name, xfs_ino_t inum, > xfs_extlen_t tot); > diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c > index 85869f604960..4579e9be5d1a 100644 > --- a/fs/xfs/libxfs/xfs_dir2_block.c > +++ b/fs/xfs/libxfs/xfs_dir2_block.c > @@ -810,9 +810,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 bd0c2f963545..c13763c16095 100644 > --- a/fs/xfs/libxfs/xfs_dir2_leaf.c > +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c > @@ -1381,9 +1381,10 @@ xfs_dir2_leaf_removename( > * Point to the leaf entry, use that to point to the data entry. > */ > lep = &leafhdr.ents[index]; > - db = xfs_dir2_dataptr_to_db(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(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(geo, leaf); > diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c > index 5a9513c036b8..39cbdeafa0f6 100644 > --- a/fs/xfs/libxfs/xfs_dir2_node.c > +++ b/fs/xfs/libxfs/xfs_dir2_node.c > @@ -1296,9 +1296,10 @@ xfs_dir2_leafn_remove( > /* > * Extract the data block and offset from the entry. > */ > - db = xfs_dir2_dataptr_to_db(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(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 c6c06e8ab54b..51d42faabb18 100644 > --- a/fs/xfs/libxfs/xfs_dir2_sf.c > +++ b/fs/xfs/libxfs/xfs_dir2_sf.c > @@ -971,6 +971,8 @@ xfs_dir2_sf_removename( > XFS_CMP_EXACT) { > ASSERT(xfs_dir2_sf_get_ino(mp, 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 05be02f6f62b..0c0c82e5dc59 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -2836,7 +2836,7 @@ xfs_remove( > if (error) > goto out_trans_cancel; > > - error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks); > + error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks, NULL); > if (error) { > ASSERT(error != -ENOENT); > goto out_trans_cancel; > @@ -3391,7 +3391,7 @@ xfs_rename( > spaceres); > else > error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino, > - spaceres); > + spaceres, NULL); > > if (error) > goto out_trans_cancel; > -- > 2.25.1 >
diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c index f7f7fa79593f..c3fa1bd1c370 100644 --- a/fs/xfs/libxfs/xfs_dir2.c +++ b/fs/xfs/libxfs/xfs_dir2.c @@ -436,7 +436,8 @@ xfs_dir_removename( struct xfs_inode *dp, struct xfs_name *name, xfs_ino_t ino, - 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; @@ -481,6 +482,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 4d1c2570b833..c581d3b19bc6 100644 --- a/fs/xfs/libxfs/xfs_dir2.h +++ b/fs/xfs/libxfs/xfs_dir2.h @@ -46,7 +46,8 @@ extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_name *ci_name); extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_name *name, xfs_ino_t ino, - xfs_extlen_t tot); + xfs_extlen_t tot, + xfs_dir2_dataptr_t *offset); extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp, const struct xfs_name *name, xfs_ino_t inum, xfs_extlen_t tot); diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c index 85869f604960..4579e9be5d1a 100644 --- a/fs/xfs/libxfs/xfs_dir2_block.c +++ b/fs/xfs/libxfs/xfs_dir2_block.c @@ -810,9 +810,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 bd0c2f963545..c13763c16095 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c @@ -1381,9 +1381,10 @@ xfs_dir2_leaf_removename( * Point to the leaf entry, use that to point to the data entry. */ lep = &leafhdr.ents[index]; - db = xfs_dir2_dataptr_to_db(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(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(geo, leaf); diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index 5a9513c036b8..39cbdeafa0f6 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -1296,9 +1296,10 @@ xfs_dir2_leafn_remove( /* * Extract the data block and offset from the entry. */ - db = xfs_dir2_dataptr_to_db(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(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 c6c06e8ab54b..51d42faabb18 100644 --- a/fs/xfs/libxfs/xfs_dir2_sf.c +++ b/fs/xfs/libxfs/xfs_dir2_sf.c @@ -971,6 +971,8 @@ xfs_dir2_sf_removename( XFS_CMP_EXACT) { ASSERT(xfs_dir2_sf_get_ino(mp, 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 05be02f6f62b..0c0c82e5dc59 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2836,7 +2836,7 @@ xfs_remove( if (error) goto out_trans_cancel; - error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks); + error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks, NULL); if (error) { ASSERT(error != -ENOENT); goto out_trans_cancel; @@ -3391,7 +3391,7 @@ xfs_rename( spaceres); else error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino, - spaceres); + spaceres, NULL); if (error) goto out_trans_cancel;
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> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --- fs/xfs/libxfs/xfs_dir2.c | 6 +++++- fs/xfs/libxfs/xfs_dir2.h | 3 ++- 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 | 4 ++-- 7 files changed, 19 insertions(+), 10 deletions(-)