From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp2120.oracle.com ([156.151.31.85]:35226 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932619AbeFKUBH (ORCPT ); Mon, 11 Jun 2018 16:01:07 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5BK0tPu182983 for ; Mon, 11 Jun 2018 20:01:06 GMT Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2jg7hwxy3d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 11 Jun 2018 20:01:06 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w5BK16t4000452 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 11 Jun 2018 20:01:06 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w5BK15Zd002600 for ; Mon, 11 Jun 2018 20:01:06 GMT From: Allison Henderson Subject: Re: [PATCH v2 24/27] xfsprogs: Add parent pointers to recreated inodes References: <1528607272-11122-1-git-send-email-allison.henderson@oracle.com> <1528607272-11122-25-git-send-email-allison.henderson@oracle.com> <20180611180647.GF22045@magnolia> Message-ID: <3e2b64dd-3449-93f8-dddd-1b3d063c6169@oracle.com> Date: Mon, 11 Jun 2018 13:00:58 -0700 MIME-Version: 1.0 In-Reply-To: <20180611180647.GF22045@magnolia> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org On 06/11/2018 11:06 AM, Darrick J. Wong wrote: > On Sat, Jun 09, 2018 at 10:07:49PM -0700, Allison Henderson wrote: >> Inodes that are not recovered from the orphanage will >> be recreated, so we will need to re-add the parent pointers >> here too. >> >> Signed-off-by: Allison Henderson >> --- >> libxfs/libxfs_api_defs.h | 1 + >> repair/phase6.c | 40 +++++++++++++++++++++++++++------------- >> 2 files changed, 28 insertions(+), 13 deletions(-) >> >> diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h >> index 78daca0..4b47479 100644 >> --- a/libxfs/libxfs_api_defs.h >> +++ b/libxfs/libxfs_api_defs.h >> @@ -152,5 +152,6 @@ >> #define xfs_rmap_compare libxfs_rmap_compare >> #define xfs_dir_get_ops libxfs_dir_get_ops >> #define xfs_default_ifork_ops libxfs_default_ifork_ops >> +#define xfs_parent_add libxfs_parent_add >> >> #endif /* __LIBXFS_API_DEFS_H__ */ >> diff --git a/repair/phase6.c b/repair/phase6.c >> index 4fedb35..96ffade 100644 >> --- a/repair/phase6.c >> +++ b/repair/phase6.c >> @@ -29,6 +29,7 @@ >> #include "dinode.h" >> #include "progress.h" >> #include "versions.h" >> +#include "xfs_parent.h" >> >> static struct cred zerocr; >> static struct fsxattr zerofsx; >> @@ -962,19 +963,20 @@ mk_root_dir(xfs_mount_t *mp) >> static xfs_ino_t >> mk_orphanage(xfs_mount_t *mp) >> { >> - xfs_ino_t ino; >> - xfs_trans_t *tp; >> - xfs_inode_t *ip; >> - xfs_inode_t *pip; >> - xfs_fsblock_t first; >> - ino_tree_node_t *irec; >> - int ino_offset = 0; >> - int i; >> - int error; >> + xfs_ino_t ino; >> + struct xfs_trans *tp; >> + struct xfs_inode *ip; >> + struct xfs_inode *pip; >> + xfs_fsblock_t first; >> + struct ino_tree_node *irec; >> + int ino_offset = 0; >> + int i; >> + int error; >> struct xfs_defer_ops dfops; >> - const int mode = 0755; >> - int nres; >> - struct xfs_name xname; >> + const int mode = 0755; >> + int nres; >> + struct xfs_name xname; >> + xfs_dir2_dataptr_t offset; >> >> /* >> * check for an existing lost+found first, if it exists, return >> @@ -1061,7 +1063,7 @@ mk_orphanage(xfs_mount_t *mp) >> * create the actual entry >> */ >> error = -libxfs_dir_createname(tp, pip, &xname, ip->i_ino, &first, >> - &dfops, nres, NULL); >> + &dfops, nres, &offset); >> if (error) >> do_error( >> _("can't make %s, createname error %d\n"), >> @@ -1083,6 +1085,18 @@ mk_orphanage(xfs_mount_t *mp) >> libxfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); >> >> libxfs_defer_ijoin(&dfops, ip); >> + >> + if (xfs_sb_version_hasparent(&mp->m_sb)) { >> + error = -libxfs_parent_add(pip, ip, &xname, offset, > > Tabs, not spaces for the indenting. > >> + &first, &dfops); >> + if (error) >> + do_error(_("Error creating parent pointer: %d\n"), >> + error); >> + libxfs_trans_log_inode(tp, pip, XFS_ILOG_CORE); >> + libxfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); >> + libxfs_defer_ijoin(&dfops, pip); > > /me wonders if it's really necessary to _defer_ijoin either of the > inodes to the transaction since we commit and IRELE both of them > immediately afterwards... > > --D Ok, let me see if I can get away with taking that out. Thx! Allison > >> + } >> + >> error = -libxfs_defer_finish(&tp, &dfops); >> if (error) { >> do_error(_("%s directory creation failed -- bmapf error %d\n"), >> -- >> 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