From: Allison Henderson <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 18/21] xfs: Add parent pointers to rename
Date: Tue, 8 May 2018 09:58:19 -0700 [thread overview]
Message-ID: <04a229c3-ecde-e3c4-bec4-c5f2eb811756@oracle.com> (raw)
In-Reply-To: <20180507215220.GD11261@magnolia>
On 05/07/2018 02:52 PM, Darrick J. Wong wrote:
> On Sun, May 06, 2018 at 10:24:51AM -0700, Allison Henderson wrote:
>> This patch removes the old parent pointer attribute during the
>> rename operation, and re-adds the updated parent pointer
>>
>> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
>> ---
>> fs/xfs/xfs_inode.c | 68 +++++++++++++++++++++++++++++++++++++++++-------------
>> 1 file changed, 52 insertions(+), 16 deletions(-)
>>
>> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
>> index b18b20c..7fd1479 100644
>> --- a/fs/xfs/xfs_inode.c
>> +++ b/fs/xfs/xfs_inode.c
>> @@ -3004,6 +3004,8 @@ xfs_rename(
>> bool src_is_directory = S_ISDIR(VFS_I(src_ip)->i_mode);
>> int spaceres;
>> int error;
>> + xfs_dir2_dataptr_t new_diroffset;
>> + xfs_dir2_dataptr_t old_diroffset;
>>
>> trace_xfs_rename(src_dp, target_dp, src_name, target_name);
>>
>> @@ -3058,14 +3060,14 @@ xfs_rename(
>> * we can rely on either trans_commit or trans_cancel to unlock
>> * them.
>> */
>> - xfs_trans_ijoin(tp, src_dp, XFS_ILOCK_EXCL);
>> + xfs_trans_ijoin(tp, src_dp, 0);
>> if (new_parent)
>> - xfs_trans_ijoin(tp, target_dp, XFS_ILOCK_EXCL);
>> - xfs_trans_ijoin(tp, src_ip, XFS_ILOCK_EXCL);
>> + xfs_trans_ijoin(tp, target_dp, 0);
>> + xfs_trans_ijoin(tp, src_ip, 0);
>> if (target_ip)
>> - xfs_trans_ijoin(tp, target_ip, XFS_ILOCK_EXCL);
>> + xfs_trans_ijoin(tp, target_ip, 0);
>> if (wip)
>> - xfs_trans_ijoin(tp, wip, XFS_ILOCK_EXCL);
>> + xfs_trans_ijoin(tp, wip, 0);
>>
>> /*
>> * If we are using project inheritance, we only allow renames
>> @@ -3075,17 +3077,18 @@ xfs_rename(
>> if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
>> (xfs_get_projid(target_dp) != xfs_get_projid(src_ip)))) {
>> error = -EXDEV;
>> - goto out_trans_cancel;
>> + goto out_unlock;
>> }
>>
>> xfs_defer_init(&dfops, &first_block);
>>
>> /* RENAME_EXCHANGE is unique from here on. */
>> - if (flags & RENAME_EXCHANGE)
>> - return xfs_cross_rename(tp, src_dp, src_name, src_ip,
>> + if (flags & RENAME_EXCHANGE) {
>> + error = xfs_cross_rename(tp, src_dp, src_name, src_ip,
>> target_dp, target_name, target_ip,
>> &dfops, &first_block, spaceres);
>> -
>> + goto out;
>> + }
>> /*
>> * Set up the target.
>> */
>> @@ -3097,7 +3100,7 @@ xfs_rename(
>> if (!spaceres) {
>> error = xfs_dir_canenter(tp, target_dp, target_name);
>> if (error)
>> - goto out_trans_cancel;
>> + goto out_unlock;
>> }
>> /*
>> * If target does not exist and the rename crosses
>> @@ -3106,7 +3109,7 @@ xfs_rename(
>> */
>> error = xfs_dir_createname(tp, target_dp, target_name,
>> src_ip->i_ino, &first_block, &dfops,
>> - spaceres, NULL);
>> + spaceres, &new_diroffset);
>> if (error)
>> goto out_bmap_cancel;
>>
>> @@ -3131,7 +3134,7 @@ xfs_rename(
>> if (!(xfs_dir_isempty(target_ip)) ||
>> (VFS_I(target_ip)->i_nlink > 2)) {
>> error = -EEXIST;
>> - goto out_trans_cancel;
>> + goto out_unlock;
>> }
>> }
>>
>> @@ -3146,7 +3149,7 @@ xfs_rename(
>> */
>> error = xfs_dir_replace(tp, target_dp, target_name,
>> src_ip->i_ino, &first_block, &dfops,
>> - spaceres, NULL);
>> + spaceres, &new_diroffset);
>> if (error)
>> goto out_bmap_cancel;
>>
>> @@ -3181,7 +3184,7 @@ xfs_rename(
>> */
>> error = xfs_dir_replace(tp, src_ip, &xfs_name_dotdot,
>> target_dp->i_ino, &first_block, &dfops,
>> - spaceres, NULL);
>> + spaceres, &new_diroffset);
>> ASSERT(error != -EEXIST);
>> if (error)
>> goto out_bmap_cancel;
>> @@ -3220,11 +3223,12 @@ xfs_rename(
>> */
>> if (wip) {
>> error = xfs_dir_replace(tp, src_dp, src_name, wip->i_ino,
>> - &first_block, &dfops, spaceres, NULL);
>> + &first_block, &dfops, spaceres,
>> + &old_diroffset);
>> } else
>> error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino,
>> &first_block, &dfops, spaceres,
>> - NULL);
>> + &old_diroffset);
>> if (error)
>> goto out_bmap_cancel;
>>
>> @@ -3254,6 +3258,18 @@ xfs_rename(
>> VFS_I(wip)->i_state &= ~I_LINKABLE;
>> }
>>
>> + if (xfs_sb_version_hasparent(&mp->m_sb)) {
>> + error = xfs_parent_add_deferred(target_dp, src_ip, target_name,
>> + new_diroffset, &dfops);
>
> Only two indents needed for the second line:
>
> error = xfs_parent_add_deferred(target_dp, src_ip, target_name,
> new_diroffset, &dfops);
> if (error)
> goto out_bmap_cancel;
>
>> + if (error)
>> + goto out_bmap_cancel;
>> +
>> + error = xfs_parent_remove_deferred(src_dp, src_ip,
>> + old_diroffset, &dfops);
>> + if (error)
>> + goto out_bmap_cancel;
>> + }
>> +
>> xfs_trans_ichgtime(tp, src_dp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
>> xfs_trans_log_inode(tp, src_dp, XFS_ILOG_CORE);
>> if (new_parent)
>> @@ -3262,10 +3278,30 @@ xfs_rename(
>> error = xfs_finish_rename(tp, &dfops);
>> if (wip)
>> IRELE(wip);
>> +out:
>> + if (wip)
>> + xfs_iunlock(wip, XFS_ILOCK_EXCL);
>
> IRELE = iput = release inode, which means that you have to unlock the
> wip inode before you can release it.
>
> --D
>
Ok, I'll move that down and fix indents. Thx!
Allison
>> + if (target_ip)
>> + xfs_iunlock(target_ip, XFS_ILOCK_EXCL);
>> + xfs_iunlock(src_ip, XFS_ILOCK_EXCL);
>> + if (new_parent)
>> + xfs_iunlock(target_dp, XFS_ILOCK_EXCL);
>> + xfs_iunlock(src_dp, XFS_ILOCK_EXCL);
>> +
>> return error;
>>
>> out_bmap_cancel:
>> xfs_defer_cancel(&dfops);
>> +out_unlock:
>> + if (wip)
>> + xfs_iunlock(wip, XFS_ILOCK_EXCL);
>> + if (target_ip)
>> + xfs_iunlock(target_ip, XFS_ILOCK_EXCL);
>> + xfs_iunlock(src_ip, XFS_ILOCK_EXCL);
>> + if (new_parent)
>> + xfs_iunlock(target_dp, XFS_ILOCK_EXCL);
>> + xfs_iunlock(src_dp, XFS_ILOCK_EXCL);
>> +
>> out_trans_cancel:
>> xfs_trans_cancel(tp);
>> out_release_wip:
>> --
>> 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-08 16:58 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
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 [this message]
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=04a229c3-ecde-e3c4-bec4-c5f2eb811756@oracle.com \
--to=allison.henderson@oracle.com \
--cc=darrick.wong@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).