From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Allison Henderson <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 10/21] xfs: get directory offset when replacing a directory name
Date: Mon, 7 May 2018 15:45:23 -0700 [thread overview]
Message-ID: <20180507224523.GL11261@magnolia> (raw)
In-Reply-To: <1525627494-12873-11-git-send-email-allison.henderson@oracle.com>
On Sun, May 06, 2018 at 10:24:43AM -0700, Allison Henderson wrote:
> From: Mark Tinguely <tinguely@sgi.com>
>
> Return the directory offset information when replacing an entry to the
> directory.
>
> This offset will be used as the parent pointer offset in xfs_rename.
>
> [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 | 3 ++-
> fs/xfs/libxfs/xfs_dir2_block.c | 4 ++--
> fs/xfs/libxfs/xfs_dir2_leaf.c | 1 +
> fs/xfs/libxfs/xfs_dir2_node.c | 1 +
> fs/xfs/libxfs/xfs_dir2_sf.c | 2 ++
> fs/xfs/xfs_inode.c | 28 +++++++++++++---------------
> 7 files changed, 31 insertions(+), 24 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c
> index 090ab0e..a4f7bcd 100644
> --- a/fs/xfs/libxfs/xfs_dir2.c
> +++ b/fs/xfs/libxfs/xfs_dir2.c
> @@ -499,13 +499,14 @@ xfs_dir_removename(
> */
> int
> xfs_dir_replace(
> - xfs_trans_t *tp,
> - xfs_inode_t *dp,
> - struct xfs_name *name, /* name of entry to replace */
> - xfs_ino_t inum, /* new inode number */
> - xfs_fsblock_t *first, /* bmap's firstblock */
> + struct xfs_trans *tp,
> + struct xfs_inode *dp,
> + struct xfs_name *name, /* name of entry to replace */
> + xfs_ino_t inum, /* new inode number */
> + 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;
> @@ -555,6 +556,9 @@ xfs_dir_replace(
> else
> rval = xfs_dir2_node_replace(args);
> out_free:
> + if (offset)
> + *offset = args->offset;
Just from a outvar purity point of view, we should only set *offset if
we're not also returning an error. AFAICT there's no practical
consequence for setting *offset and returning a negative number, just a
nit to pick. :P
The rest looks ok, so:
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> +
> kmem_free(args);
> return rval;
> }
> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
> index b73bdcb..d361442 100644
> --- a/fs/xfs/libxfs/xfs_dir2.h
> +++ b/fs/xfs/libxfs/xfs_dir2.h
> @@ -145,7 +145,8 @@ extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp,
> 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,
> - 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_canenter(struct xfs_trans *tp, struct xfs_inode *dp,
> struct xfs_name *name);
>
> diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c
> index 9c1e485..77744e5 100644
> --- a/fs/xfs/libxfs/xfs_dir2_block.c
> +++ b/fs/xfs/libxfs/xfs_dir2_block.c
> @@ -872,9 +872,9 @@ xfs_dir2_block_replace(
> /*
> * Point to the data entry we need to change.
> */
> + 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));
> ASSERT(be64_to_cpu(dep->inumber) != args->inumber);
> /*
> * Change the inode number to the new value.
> diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c
> index c5595c1..6ad7741 100644
> --- a/fs/xfs/libxfs/xfs_dir2_leaf.c
> +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c
> @@ -1550,6 +1550,7 @@ xfs_dir2_leaf_replace(
> /*
> * Point to the data entry.
> */
> + args->offset = be32_to_cpu(lep->address);
> dep = (xfs_dir2_data_entry_t *)
> ((char *)dbp->b_addr +
> xfs_dir2_dataptr_to_off(args->geo, be32_to_cpu(lep->address)));
> diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
> index eb8b240..ccf220a 100644
> --- a/fs/xfs/libxfs/xfs_dir2_node.c
> +++ b/fs/xfs/libxfs/xfs_dir2_node.c
> @@ -2256,6 +2256,7 @@ xfs_dir2_node_replace(
> hdr = state->extrablk.bp->b_addr;
> ASSERT(hdr->magic == cpu_to_be32(XFS_DIR2_DATA_MAGIC) ||
> hdr->magic == cpu_to_be32(XFS_DIR3_DATA_MAGIC));
> + args->offset = be32_to_cpu(lep->address);
> dep = (xfs_dir2_data_entry_t *)
> ((char *)hdr +
> xfs_dir2_dataptr_to_off(args->geo,
> diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c
> index 1d0957c..73f1eef 100644
> --- a/fs/xfs/libxfs/xfs_dir2_sf.c
> +++ b/fs/xfs/libxfs/xfs_dir2_sf.c
> @@ -1043,6 +1043,8 @@ xfs_dir2_sf_replace(
> ASSERT(args->inumber != ino);
> dp->d_ops->sf_put_ino(sfp, sfep, args->inumber);
> dp->d_ops->sf_put_ftype(sfep, args->filetype);
> + 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 3054e9a..5c291d2 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -2783,16 +2783,14 @@ xfs_cross_rename(
> int dp2_flags = 0;
>
> /* Swap inode number for dirent in first parent */
> - error = xfs_dir_replace(tp, dp1, name1,
> - ip2->i_ino,
> - first_block, dfops, spaceres);
> + error = xfs_dir_replace(tp, dp1, name1, ip2->i_ino, first_block, dfops,
> + spaceres, NULL);
> if (error)
> goto out_trans_abort;
>
> /* Swap inode number for dirent in second parent */
> - error = xfs_dir_replace(tp, dp2, name2,
> - ip1->i_ino,
> - first_block, dfops, spaceres);
> + error = xfs_dir_replace(tp, dp2, name2, ip1->i_ino, first_block, dfops,
> + spaceres, NULL);
> if (error)
> goto out_trans_abort;
>
> @@ -2806,8 +2804,8 @@ xfs_cross_rename(
>
> if (S_ISDIR(VFS_I(ip2)->i_mode)) {
> error = xfs_dir_replace(tp, ip2, &xfs_name_dotdot,
> - dp1->i_ino, first_block,
> - dfops, spaceres);
> + dp1->i_ino, first_block, dfops,
> + spaceres, NULL);
> if (error)
> goto out_trans_abort;
>
> @@ -2833,8 +2831,8 @@ xfs_cross_rename(
>
> if (S_ISDIR(VFS_I(ip1)->i_mode)) {
> error = xfs_dir_replace(tp, ip1, &xfs_name_dotdot,
> - dp2->i_ino, first_block,
> - dfops, spaceres);
> + dp2->i_ino, first_block, dfops,
> + spaceres, NULL);
> if (error)
> goto out_trans_abort;
>
> @@ -3081,8 +3079,8 @@ xfs_rename(
> * name at the destination directory, remove it first.
> */
> error = xfs_dir_replace(tp, target_dp, target_name,
> - src_ip->i_ino,
> - &first_block, &dfops, spaceres);
> + src_ip->i_ino, &first_block, &dfops,
> + spaceres, NULL);
> if (error)
> goto out_bmap_cancel;
>
> @@ -3116,8 +3114,8 @@ xfs_rename(
> * directory.
> */
> error = xfs_dir_replace(tp, src_ip, &xfs_name_dotdot,
> - target_dp->i_ino,
> - &first_block, &dfops, spaceres);
> + target_dp->i_ino, &first_block, &dfops,
> + spaceres, NULL);
> ASSERT(error != -EEXIST);
> if (error)
> goto out_bmap_cancel;
> @@ -3156,7 +3154,7 @@ xfs_rename(
> */
> if (wip) {
> error = xfs_dir_replace(tp, src_dp, src_name, wip->i_ino,
> - &first_block, &dfops, spaceres);
> + &first_block, &dfops, spaceres, NULL);
> } else
> error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino,
> &first_block, &dfops, spaceres,
> --
> 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
next prev parent reply other threads:[~2018-05-07 22:47 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-06 17:24 [PATCH 00/21] Parent Pointers v6 Allison Henderson
2018-05-06 17:24 ` [PATCH 01/21] xfs: Move fs/xfs/xfs_attr.h to fs/xfs/libxfs/xfs_attr.h Allison Henderson
2018-05-07 23:39 ` Darrick J. Wong
2018-05-06 17:24 ` [PATCH 02/21] Add trans toggle to attr routines Allison Henderson
2018-05-07 23:52 ` Darrick J. Wong
2018-05-08 17:04 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 03/21] xfs: Add attibute set and helper functions Allison Henderson
2018-05-07 23:36 ` Darrick J. Wong
2018-05-08 7:25 ` Amir Goldstein
2018-05-08 17:02 ` Allison Henderson
2018-05-08 17:01 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 04/21] xfs: Add attibute remove " Allison Henderson
2018-05-07 23:21 ` Darrick J. Wong
2018-05-08 7:33 ` Amir Goldstein
2018-05-08 17:02 ` Allison Henderson
2018-05-08 17:14 ` Darrick J. Wong
2018-05-06 17:24 ` [PATCH 05/21] xfs: Set up infastructure for deferred attribute operations Allison Henderson
2018-05-07 23:19 ` Darrick J. Wong
2018-05-08 17:01 ` Allison Henderson
2018-05-08 9:55 ` Amir Goldstein
2018-05-06 17:24 ` [PATCH 06/21] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2018-05-07 22:59 ` Darrick J. Wong
2018-05-08 17:01 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 07/21] xfs: Remove all strlen calls in all xfs_attr_* functions for attr names Allison Henderson
2018-05-07 22:54 ` Darrick J. Wong
2018-05-08 17:00 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 08/21] xfs: get directory offset when adding directory name Allison Henderson
2018-05-07 22:50 ` Darrick J. Wong
2018-05-06 17:24 ` [PATCH 09/21] xfs: get directory offset when removing " Allison Henderson
2018-05-07 22:48 ` Darrick J. Wong
2018-05-08 17:00 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 10/21] xfs: get directory offset when replacing a " Allison Henderson
2018-05-07 22:45 ` Darrick J. Wong [this message]
2018-05-08 17:00 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 11/21] xfs: add parent pointer support to attribute code Allison Henderson
2018-05-07 22:36 ` Darrick J. Wong
2018-05-06 17:24 ` [PATCH 12/21] xfs: define parent pointer xattr format Allison Henderson
2018-05-07 22:35 ` Darrick J. Wong
2018-05-08 17:00 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 13/21] xfs: extent transaction reservations for parent attributes Allison Henderson
2018-05-07 22:34 ` Darrick J. Wong
2018-05-08 17:00 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 14/21] Add lock_flags to xfs_ialloc and xfs_dir_ialloc Allison Henderson
2018-05-07 22:30 ` Darrick J. Wong
2018-05-08 16:59 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 15/21] xfs: parent pointer attribute creation Allison Henderson
2018-05-07 22:19 ` Darrick J. Wong
2018-05-08 16:58 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 16/21] xfs: add parent attributes to link Allison Henderson
2018-05-07 22:12 ` Darrick J. Wong
2018-05-08 16:58 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 17/21] xfs: remove parent pointers in unlink Allison Henderson
2018-05-07 21:59 ` Darrick J. Wong
2018-05-08 16:58 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 18/21] xfs: Add parent pointers to rename Allison Henderson
2018-05-07 21:52 ` Darrick J. Wong
2018-05-08 16:58 ` Allison Henderson
2018-05-08 10:04 ` Amir Goldstein
2018-05-06 17:24 ` [PATCH 19/21] xfs: Add the parent pointer support to the superblock version 5 Allison Henderson
2018-05-07 21:38 ` Darrick J. Wong
2018-05-08 16:58 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 20/21] xfs: Add parent pointer ioctl Allison Henderson
2018-05-07 21:36 ` Darrick J. Wong
2018-05-08 10:24 ` Amir Goldstein
2018-05-08 10:25 ` Amir Goldstein
2018-05-08 16:57 ` Allison Henderson
2018-05-15 16:27 ` Catalin Iacob
2018-05-15 16:52 ` Allison Henderson
2018-05-06 17:24 ` [PATCH 21/21] xfs: Add delayed attributes error tag Allison Henderson
2018-05-07 20:57 ` Darrick J. Wong
2018-05-08 5:36 ` [PATCH 00/21] Parent Pointers v6 Amir Goldstein
2018-05-08 17:03 ` Allison Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180507224523.GL11261@magnolia \
--to=darrick.wong@oracle.com \
--cc=allison.henderson@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).