From: Allison Henderson <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org, Mark Tinguely <tinguely@sgi.com>,
Dave Chinner <dchinner@redhat.com>
Subject: Re: [PATCH v3 07/17] xfs: get directory offset when replacing a directory name
Date: Wed, 29 Nov 2017 11:49:19 -0700 [thread overview]
Message-ID: <e6677fe9-3844-261d-036a-ab6eb72b8ed6@oracle.com> (raw)
In-Reply-To: <20171128190412.GS21412@magnolia>
On 11/28/2017 12:04 PM, Darrick J. Wong wrote:
> On Fri, Nov 17, 2017 at 11:21:35AM -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]
>>
>> 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>
>> ---
>> v2: Changed typedefs to raw struct types
>>
>> 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 b647bf2..25b370b 100644
>> --- a/fs/xfs/libxfs/xfs_dir2.c
>> +++ b/fs/xfs/libxfs/xfs_dir2.c
>> @@ -508,13 +508,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;
>> @@ -563,6 +564,9 @@ xfs_dir_replace(
>> rval = xfs_dir2_leaf_replace(args);
>> else
>> rval = xfs_dir2_node_replace(args);
>> +
>> + if (offset)
>> + *offset = args->offset;
>> out_free:
> FWIW I complained in the review for a subsequent patch about the out_free
> label moving to above the "if (offset)" hunk.
>
> --D
Ok, I'll get it folded in here
>> kmem_free(args);
>> return rval;
>> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
>> index e1bd05d..5cc0b3f 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 4dbe2fc..69dfe64 100644
>> --- a/fs/xfs/libxfs/xfs_dir2_block.c
>> +++ b/fs/xfs/libxfs/xfs_dir2_block.c
>> @@ -865,9 +865,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 197e627..770b93f 100644
>> --- a/fs/xfs/libxfs/xfs_dir2_leaf.c
>> +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c
>> @@ -1518,6 +1518,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 13d5244..860a612 100644
>> --- a/fs/xfs/libxfs/xfs_dir2_node.c
>> +++ b/fs/xfs/libxfs/xfs_dir2_node.c
>> @@ -2237,6 +2237,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 9e90c22..295458f 100644
>> --- a/fs/xfs/libxfs/xfs_dir2_sf.c
>> +++ b/fs/xfs/libxfs/xfs_dir2_sf.c
>> @@ -1045,6 +1045,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 358a98a..f7986d8 100644
>> --- a/fs/xfs/xfs_inode.c
>> +++ b/fs/xfs/xfs_inode.c
>> @@ -2774,16 +2774,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;
>>
>> @@ -2797,8 +2795,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;
>>
>> @@ -2824,8 +2822,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;
>>
>> @@ -3072,8 +3070,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;
>>
>> @@ -3107,8 +3105,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;
>> @@ -3147,7 +3145,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 tomajordomo@vger.kernel.org
>> More majordomo info athttps://urldefense.proofpoint.com/v2/url?u=http-3A__vger.kernel.org_majordomo-2Dinfo.html&d=DwIBAg&c=RoP1YumCXCgaWHvlZYR8PZh8Bv7qIrMUB65eapI_JnE&r=LHZQ8fHvy6wDKXGTWcm97burZH5sQKHRDMaY1UthQxc&m=OmnRnl5PP77MyfzpnPKFHs1VduH0GTb1IP9D8bssMT0&s=qI6-Zzze17jYSFlCUyua2MRuhxSgMoUvrV4u3VMMkko&e=
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message tomajordomo@vger.kernel.org
> More majordomo info athttps://urldefense.proofpoint.com/v2/url?u=http-3A__vger.kernel.org_majordomo-2Dinfo.html&d=DwIBAg&c=RoP1YumCXCgaWHvlZYR8PZh8Bv7qIrMUB65eapI_JnE&r=LHZQ8fHvy6wDKXGTWcm97burZH5sQKHRDMaY1UthQxc&m=OmnRnl5PP77MyfzpnPKFHs1VduH0GTb1IP9D8bssMT0&s=qI6-Zzze17jYSFlCUyua2MRuhxSgMoUvrV4u3VMMkko&e=
next prev parent reply other threads:[~2017-11-29 18:49 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-17 18:21 [PATCH v3 00/17] Parent Pointers v4 Allison Henderson
2017-11-17 18:21 ` [PATCH v3 01/17] Add helper functions xfs_attr_set_args and xfs_attr_remove_args Allison Henderson
2017-11-28 19:54 ` Darrick J. Wong
2017-11-29 1:02 ` Dave Chinner
2017-11-29 18:52 ` Allison Henderson
2017-11-29 22:34 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 02/17] Set up infastructure for deferred attribute operations Allison Henderson
2017-11-28 19:45 ` Darrick J. Wong
2017-11-29 1:19 ` Dave Chinner
2017-11-29 18:52 ` Allison Henderson
2017-11-29 18:51 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 03/17] Add xfs_attr_set_defered and xfs_attr_remove_defered Allison Henderson
2017-11-28 19:19 ` Darrick J. Wong
2017-11-29 18:50 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 04/17] Remove all strlen calls in all xfs_attr_* functions for attr names Allison Henderson
2017-11-28 19:10 ` Darrick J. Wong
2017-11-29 18:50 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 05/17] xfs: get directory offset when adding directory name Allison Henderson
2017-11-28 19:07 ` Darrick J. Wong
2017-11-29 18:50 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 06/17] xfs: get directory offset when removing " Allison Henderson
2017-11-28 19:05 ` Darrick J. Wong
2017-11-29 18:49 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 07/17] xfs: get directory offset when replacing a " Allison Henderson
2017-11-28 19:04 ` Darrick J. Wong
2017-11-29 18:49 ` Allison Henderson [this message]
2017-11-17 18:21 ` [PATCH v3 08/17] xfs: add parent pointer support to attribute code Allison Henderson
2017-11-28 19:01 ` Darrick J. Wong
2017-11-29 18:48 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 09/17] xfs: define parent pointer xattr format Allison Henderson
2017-11-28 18:59 ` Darrick J. Wong
2017-11-29 18:48 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 10/17] xfs: extent transaction reservations for parent attributes Allison Henderson
2017-11-28 18:58 ` Darrick J. Wong
2017-11-29 18:48 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 11/17] Add the extra space requirements for parent pointer attributes when calculating the minimum log size during mkfs Allison Henderson
2017-11-28 18:51 ` Darrick J. Wong
2017-11-29 18:47 ` Allison Henderson
2017-11-29 20:18 ` Darrick J. Wong
2017-11-17 18:21 ` [PATCH v3 12/17] xfs: parent pointer attribute creation Allison Henderson
2017-11-28 18:49 ` Darrick J. Wong
2017-11-28 18:54 ` Darrick J. Wong
2017-11-29 18:46 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 13/17] xfs: add parent attributes to link Allison Henderson
2017-11-28 18:37 ` Darrick J. Wong
2017-11-29 18:45 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 14/17] xfs: remove parent pointers in unlink Allison Henderson
2017-11-28 18:24 ` Darrick J. Wong
2017-11-29 18:44 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 15/17] Add parent pointers to rename Allison Henderson
2017-11-28 18:20 ` Darrick J. Wong
2017-11-29 18:43 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 16/17] Add the parent pointer support to the superblock version 5 Allison Henderson
2017-11-28 18:08 ` Darrick J. Wong
2017-11-29 18:41 ` Allison Henderson
2017-11-17 18:21 ` [PATCH v3 17/17] Add parent pointer ioctl Allison Henderson
2017-11-22 19:54 ` Allison Henderson
2017-11-22 21:07 ` Dave Chinner
2017-11-22 22:49 ` Allison Henderson
2017-11-22 21:13 ` Darrick J. Wong
2017-11-22 22:49 ` Allison Henderson
2017-11-28 20:35 ` Darrick J. Wong
2017-11-29 18:52 ` Allison Henderson
2017-11-29 21:37 ` Dave Chinner
2017-11-29 22:48 ` Allison Henderson
2017-11-30 0:02 ` Dave Chinner
2017-11-30 1:52 ` Allison Henderson
2017-11-30 21:11 ` Darrick J. Wong
2017-12-01 2:58 ` Dave Chinner
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=e6677fe9-3844-261d-036a-ab6eb72b8ed6@oracle.com \
--to=allison.henderson@oracle.com \
--cc=darrick.wong@oracle.com \
--cc=dchinner@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=tinguely@sgi.com \
/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).