From: Allison Henderson <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v2 25/27] xfsprogs: Add parent pointers during protofile creation
Date: Mon, 11 Jun 2018 12:58:50 -0700 [thread overview]
Message-ID: <b240d527-d721-1728-2c36-a43db4544dc5@oracle.com> (raw)
In-Reply-To: <20180611181529.GG22045@magnolia>
On 06/11/2018 11:15 AM, Darrick J. Wong wrote:
> On Sat, Jun 09, 2018 at 10:07:50PM -0700, Allison Henderson wrote:
>> Inodes created from protofile parsing will also need to
>> add the appropriate parent pointers
>>
>> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
>> ---
>> mkfs/proto.c | 55 ++++++++++++++++++++++++++++++++++++-------------------
>> 1 file changed, 36 insertions(+), 19 deletions(-)
>>
>> diff --git a/mkfs/proto.c b/mkfs/proto.c
>> index 67c228a..222479f 100644
>> --- a/mkfs/proto.c
>> +++ b/mkfs/proto.c
>> @@ -19,6 +19,7 @@
>> #include "libxfs.h"
>> #include <sys/stat.h>
>> #include "xfs_multidisk.h"
>> +#include "xfs_parent.h"
>>
>> /*
>> * Prototypes for internal functions.
>> @@ -318,23 +319,25 @@ newregfile(
>>
>> static void
>> newdirent(
>> - xfs_mount_t *mp,
>> - xfs_trans_t *tp,
>> - xfs_inode_t *pip,
>> - struct xfs_name *name,
>> - xfs_ino_t inum,
>> - xfs_fsblock_t *first,
>> - struct xfs_defer_ops *dfops)
>> + struct xfs_mount *mp,
>> + struct xfs_trans *tp,
>> + struct xfs_inode *pip,
>> + struct xfs_name *name,
>> + struct xfs_inode *ip,
>> + xfs_fsblock_t *first,
>> + struct xfs_defer_ops *dfops,
>> + xfs_dir2_dataptr_t *offset)
>> {
>> - int error;
>> - int rsv;
>> + int error;
>> + int rsv;
>>
>> rsv = XFS_DIRENTER_SPACE_RES(mp, name->len);
>>
>> - error = -libxfs_dir_createname(tp, pip, name, inum, first, dfops, rsv,
>> - NULL);
>> + error = -libxfs_dir_createname(tp, pip, name, ip->i_ino, first, dfops, rsv,
>> + offset);
>
> This line is over 80 characters, please just rewrap the whole thing:
>
> error = -libxfs_dir_createname(tp, pip, name, ip->i_ino, first, dfops,
> rsv, offset);
>
>> if (error)
>> fail(_("directory createname error"), error);
>> +
>> }
>>
>> static void
>> @@ -387,6 +390,7 @@ parseproto(
>> cred_t creds;
>> char *value;
>> struct xfs_name xname;
>> + xfs_dir2_dataptr_t offset;
>>
>> memset(&creds, 0, sizeof(creds));
>> mstr = getstr(pp);
>> @@ -470,7 +474,7 @@ parseproto(
>> free(buf);
>> libxfs_trans_ijoin(tp, pip, 0);
>> xname.type = XFS_DIR3_FT_REG_FILE;
>> - newdirent(mp, tp, pip, &xname, ip->i_ino, &first, &dfops);
>> + newdirent(mp, tp, pip, &xname, ip, &first, &dfops, &offset);
>> break;
>>
>> case IF_RESERVED: /* pre-allocated space only */
>> @@ -493,7 +497,7 @@ parseproto(
>> libxfs_trans_ijoin(tp, pip, 0);
>>
>> xname.type = XFS_DIR3_FT_REG_FILE;
>> - newdirent(mp, tp, pip, &xname, ip->i_ino, &first, &dfops);
>> + newdirent(mp, tp, pip, &xname, ip, &first, &dfops, &offset);
>> libxfs_trans_log_inode(tp, ip, flags);
>>
>> libxfs_defer_ijoin(&dfops, ip);
>> @@ -516,7 +520,7 @@ parseproto(
>> }
>> libxfs_trans_ijoin(tp, pip, 0);
>> xname.type = XFS_DIR3_FT_BLKDEV;
>> - newdirent(mp, tp, pip, &xname, ip->i_ino, &first, &dfops);
>> + newdirent(mp, tp, pip, &xname, ip, &first, &dfops, &offset);
>> flags |= XFS_ILOG_DEV;
>> break;
>>
>> @@ -530,7 +534,7 @@ parseproto(
>> fail(_("Inode allocation failed"), error);
>> libxfs_trans_ijoin(tp, pip, 0);
>> xname.type = XFS_DIR3_FT_CHRDEV;
>> - newdirent(mp, tp, pip, &xname, ip->i_ino, &first, &dfops);
>> + newdirent(mp, tp, pip, &xname, ip, &first, &dfops, &offset);
>> flags |= XFS_ILOG_DEV;
>> break;
>>
>> @@ -542,7 +546,7 @@ parseproto(
>> fail(_("Inode allocation failed"), error);
>> libxfs_trans_ijoin(tp, pip, 0);
>> xname.type = XFS_DIR3_FT_FIFO;
>> - newdirent(mp, tp, pip, &xname, ip->i_ino, &first, &dfops);
>> + newdirent(mp, tp, pip, &xname, ip, &first, &dfops, &offset);
>> break;
>> case IF_SYMLINK:
>> buf = getstr(pp);
>> @@ -555,7 +559,7 @@ parseproto(
>> flags |= newfile(tp, ip, &dfops, &first, 1, 1, buf, len);
>> libxfs_trans_ijoin(tp, pip, 0);
>> xname.type = XFS_DIR3_FT_SYMLINK;
>> - newdirent(mp, tp, pip, &xname, ip->i_ino, &first, &dfops);
>> + newdirent(mp, tp, pip, &xname, ip, &first, &dfops, &offset);
>> break;
>> case IF_DIRECTORY:
>> tp = getres(mp, 0);
>> @@ -572,8 +576,8 @@ parseproto(
>> } else {
>> libxfs_trans_ijoin(tp, pip, 0);
>> xname.type = XFS_DIR3_FT_DIR;
>> - newdirent(mp, tp, pip, &xname, ip->i_ino,
>> - &first, &dfops);
>> + newdirent(mp, tp, pip, &xname, ip,
>> + &first, &dfops, &offset);
>> inc_nlink(VFS_I(pip));
>> libxfs_trans_log_inode(tp, pip, XFS_ILOG_CORE);
>> }
>> @@ -612,6 +616,19 @@ parseproto(
>> fail(_("Error encountered creating file from prototype file"),
>> error);
>> }
>> +
>> + if (xfs_sb_version_hasparent(&mp->m_sb)) {
>> + error = xfs_parent_add(pip, ip, &xname, offset, &first, &dfops);
>
> Didn't we just _defer_finish(&dfops) in the hunk right above this? Why
> not add the deferred pptr before the first _defer_finish call?
>
> --D
Oh ok, I'll see if I can move it up and get rid of the extra finish. Thx!
Allison
>
>> + if (error)
>> + fail(_("Error creating parent pointer"), error);
>> +
>> + libxfs_trans_log_inode(tp, ip, flags);
>> + libxfs_defer_ijoin(&dfops, ip);
>> + error = -libxfs_defer_finish(&tp, &dfops);
>> + if (error)
>> + fail(_("Directory creation failed"), error);
>> + }
>> +
>> libxfs_trans_commit(tp);
>> IRELE(ip);
>> }
>> --
>> 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-06-11 19:58 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-10 5:07 [PATCH v2 00/27] xfsprogs: parent pointers v2 Allison Henderson
2018-06-10 5:07 ` [PATCH v2 01/27] xfsprogs: Move xfs_attr.h to libxfs Allison Henderson
2018-06-10 5:07 ` [PATCH v2 02/27] xfsprogs: Add helper function xfs_attr_try_sf_addname Allison Henderson
2018-06-10 5:07 ` [PATCH v2 03/27] xfsprogs: Add trans toggle to attr routines Allison Henderson
2018-06-10 7:02 ` Amir Goldstein
2018-06-10 16:19 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 04/27] xfsprogs: Add attibute set and helper functions Allison Henderson
2018-06-10 5:07 ` [PATCH v2 05/27] xfsprogs: Add attibute remove " Allison Henderson
2018-06-10 5:07 ` [PATCH v2 06/27] xfsprogs: Set up infastructure for deferred attribute operations Allison Henderson
2018-06-10 5:07 ` [PATCH v2 07/27] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2018-06-10 5:07 ` [PATCH v2 08/27] xfsprogs: Remove all strlen calls in all xfs_attr_* functions for attr names Allison Henderson
2018-06-10 5:07 ` [PATCH v2 09/27] xfsprogs: get directory offset when adding directory name Allison Henderson
2018-06-10 5:07 ` [PATCH v2 10/27] xfsprogs: get directory offset when removing " Allison Henderson
2018-06-10 5:07 ` [PATCH v2 11/27] xfsprogs: get directory offset when replacing a " Allison Henderson
2018-06-10 5:07 ` [PATCH v2 12/27] xfsprogs: add parent pointer support to attribute code Allison Henderson
2018-06-10 5:07 ` [PATCH v2 13/27] xfsprogs: define parent pointer xattr format Allison Henderson
2018-06-10 5:07 ` [PATCH v2 14/27] xfsprogs: extent transaction reservations for parent attributes Allison Henderson
2018-06-10 5:07 ` [PATCH v2 15/27] xfsprogs: parent pointer attribute creation Allison Henderson
2018-06-10 5:07 ` [PATCH v2 16/27] xfsprogs: Add the parent pointer support to the superblock version 5 Allison Henderson
2018-06-10 5:07 ` [PATCH v2 17/27] xfsprogs: Add helper function xfs_attr_list_context_init Allison Henderson
2018-06-10 5:07 ` [PATCH v2 18/27] xfsprogs: Add parent pointer ioctl Allison Henderson
2018-06-10 5:07 ` [PATCH v2 19/27] xfsprogs: Add delayed attributes error tag Allison Henderson
2018-06-11 17:28 ` Darrick J. Wong
2018-06-11 19:59 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 20/27] xfsprogs: Add parent pointer flag to cmd Allison Henderson
2018-06-11 17:43 ` Darrick J. Wong
2018-06-11 20:00 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 21/27] xfsprogs: Remove single byte array from struct parent Allison Henderson
2018-06-10 11:21 ` Amir Goldstein
2018-06-10 15:25 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 22/27] xfsprogs: Add log item printing for ATTRI and ATTRD Allison Henderson
2018-06-10 5:07 ` [PATCH v2 23/27] xfsprogs: Do not use namechecks on parent pointers Allison Henderson
2018-06-11 18:00 ` Darrick J. Wong
2018-06-11 20:00 ` Allison Henderson
2018-06-11 20:23 ` Darrick J. Wong
2018-06-11 20:38 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 24/27] xfsprogs: Add parent pointers to recreated inodes Allison Henderson
2018-06-10 11:27 ` Amir Goldstein
2018-06-10 17:19 ` Allison Henderson
2018-06-11 17:31 ` Darrick J. Wong
2018-06-11 18:06 ` Darrick J. Wong
2018-06-11 20:00 ` Allison Henderson
2018-06-10 5:07 ` [PATCH v2 25/27] xfsprogs: Add parent pointers during protofile creation Allison Henderson
2018-06-10 11:32 ` Amir Goldstein
2018-06-11 18:15 ` Darrick J. Wong
2018-06-11 19:58 ` Allison Henderson [this message]
2018-06-10 5:07 ` [PATCH v2 26/27] xfsprogs: implement the upper half of parent pointers Allison Henderson
2018-06-10 12:06 ` Amir Goldstein
2018-06-10 5:07 ` [PATCH v2 27/27] xfsprogs: Clean up old parent pointer definitions Allison Henderson
2018-06-11 18:20 ` Darrick J. Wong
2018-06-11 20:06 ` 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=b240d527-d721-1728-2c36-a43db4544dc5@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).