From patchwork Sun Jun 10 05:07:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 10456545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BB41F601F7 for ; Sun, 10 Jun 2018 05:10:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB08020700 for ; Sun, 10 Jun 2018 05:10:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9FDB025D99; Sun, 10 Jun 2018 05:10:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83E8A20700 for ; Sun, 10 Jun 2018 05:10:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753722AbeFJFKO (ORCPT ); Sun, 10 Jun 2018 01:10:14 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:47920 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753707AbeFJFKL (ORCPT ); Sun, 10 Jun 2018 01:10:11 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5A5707u007076 for ; Sun, 10 Jun 2018 05:10:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=xk/S2/Q2vYJplWclYg2M1rA5nLxA8hWtPTDb4KOPelQ=; b=jXahcrN5Fzt9l0QLLOdcPmgpsZTP1iKg0OqBkYycBAp6YZx14LgoAapUWvLQszja7m67 dKGSMLH8P3qhGi4be6IM3XEVCA2/nAkmdAcBLZjow0K+mKgxjFlnCJPFfCppgQDssCcP Z5/zkmfBFRa2OAUbmluoOIt563YrRuYlCZtON/qTdhE6K+Mqpom743O0dUzmrbpFmRqg yzAflMYvEyQpfGIArGSZO3huzmGdsdHFy+/QeGylMopv+XQcob5KrifASAt6prBgkgOz WHLt++NQ4rMNA1lvnmQn7J84za+G+43UcK3WAYY7RnG4f4DbK7LwaeBIjSRNHef7Qn4U Bg== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2130.oracle.com with ESMTP id 2jg4dkt26u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 10 Jun 2018 05:10:10 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w5A5AAob024500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 10 Jun 2018 05:10:10 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w5A5A9VL013957 for ; Sun, 10 Jun 2018 05:10:09 GMT Received: from localhost.localdomain (/72.210.40.165) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 09 Jun 2018 22:10:09 -0700 From: Allison Henderson To: linux-xfs@vger.kernel.org Subject: [PATCH v2 09/27] xfsprogs: get directory offset when adding directory name Date: Sat, 9 Jun 2018 22:07:34 -0700 Message-Id: <1528607272-11122-10-git-send-email-allison.henderson@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528607272-11122-1-git-send-email-allison.henderson@oracle.com> References: <1528607272-11122-1-git-send-email-allison.henderson@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8919 signatures=668702 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=3 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806100059 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Return the directory offset information when adding an entry to the directory. This offset will be used as the parent pointer offset in xfs_create, xfs_symlink, xfs_link and xfs_rename. [dchinner: forward ported and cleaned up] [dchinner: no s-o-b from Mark] [bfoster: rebased, use args->geo in dir code] [achender: rebased, chaged __uint32_t to xfs_dir2_dataptr_t] Signed-off-by: Dave Chinner Signed-off-by: Allison Henderson --- libxfs/xfs_da_btree.h | 1 + libxfs/xfs_dir2.c | 9 +++++++-- libxfs/xfs_dir2.h | 3 ++- libxfs/xfs_dir2_block.c | 1 + libxfs/xfs_dir2_leaf.c | 2 ++ libxfs/xfs_dir2_node.c | 2 ++ libxfs/xfs_dir2_sf.c | 2 ++ mkfs/proto.c | 3 ++- repair/phase6.c | 17 +++++++++-------- 9 files changed, 28 insertions(+), 12 deletions(-) diff --git a/libxfs/xfs_da_btree.h b/libxfs/xfs_da_btree.h index ae6de17..bce96d6 100644 --- a/libxfs/xfs_da_btree.h +++ b/libxfs/xfs_da_btree.h @@ -86,6 +86,7 @@ typedef struct xfs_da_args { int rmtvaluelen2; /* remote attr value length in bytes */ int op_flags; /* operation flags */ enum xfs_dacmp cmpresult; /* name compare result for lookups */ + xfs_dir2_dataptr_t offset; /* OUT: offset in directory */ } xfs_da_args_t; /* diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c index d82eaab..cd67e1b 100644 --- a/libxfs/xfs_dir2.c +++ b/libxfs/xfs_dir2.c @@ -255,7 +255,8 @@ xfs_dir_createname( xfs_ino_t inum, /* new entry 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 entry's dir offset */ { struct xfs_da_args *args; int rval; @@ -311,6 +312,10 @@ xfs_dir_createname( rval = xfs_dir2_node_addname(args); out_free: + /* return the location that this entry was place in the parent inode */ + if (offset) + *offset = args->offset; + kmem_free(args); return rval; } @@ -557,7 +562,7 @@ xfs_dir_canenter( xfs_inode_t *dp, struct xfs_name *name) /* name of entry to add */ { - return xfs_dir_createname(tp, dp, name, 0, NULL, NULL, 0); + return xfs_dir_createname(tp, dp, name, 0, NULL, NULL, 0, NULL); } /* diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h index 388d67c..378c654 100644 --- a/libxfs/xfs_dir2.h +++ b/libxfs/xfs_dir2.h @@ -131,7 +131,8 @@ extern int xfs_dir_init(struct xfs_trans *tp, struct xfs_inode *dp, extern int xfs_dir_createname(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_lookup(struct xfs_trans *tp, struct xfs_inode *dp, struct xfs_name *name, xfs_ino_t *inum, struct xfs_name *ci_name); diff --git a/libxfs/xfs_dir2_block.c b/libxfs/xfs_dir2_block.c index e2c524e..4815d26 100644 --- a/libxfs/xfs_dir2_block.c +++ b/libxfs/xfs_dir2_block.c @@ -549,6 +549,7 @@ xfs_dir2_block_addname( dp->d_ops->data_put_ftype(dep, args->filetype); tagp = dp->d_ops->data_entry_tag_p(dep); *tagp = cpu_to_be16((char *)dep - (char *)hdr); + args->offset = xfs_dir2_byte_to_dataptr((char *)dep - (char *)hdr); /* * Clean up the bestfree array and log the header, tail, and entry. */ diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c index 60f7eb2..949e798 100644 --- a/libxfs/xfs_dir2_leaf.c +++ b/libxfs/xfs_dir2_leaf.c @@ -887,6 +887,8 @@ xfs_dir2_leaf_addname( dp->d_ops->data_put_ftype(dep, args->filetype); tagp = dp->d_ops->data_entry_tag_p(dep); *tagp = cpu_to_be16((char *)dep - (char *)hdr); + args->offset = xfs_dir2_db_off_to_dataptr(args->geo, use_block, + (char *)dep - (char *)hdr); /* * Need to scan fix up the bestfree table. */ diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c index 6d7986c..697e37e 100644 --- a/libxfs/xfs_dir2_node.c +++ b/libxfs/xfs_dir2_node.c @@ -2032,6 +2032,8 @@ xfs_dir2_node_addname_int( dp->d_ops->data_put_ftype(dep, args->filetype); tagp = dp->d_ops->data_entry_tag_p(dep); *tagp = cpu_to_be16((char *)dep - (char *)hdr); + args->offset = xfs_dir2_db_off_to_dataptr(args->geo, dbno, + (char *)dep - (char *)hdr); xfs_dir2_data_log_entry(args, dbp, dep); /* * Rescan the block for bestfree if needed. diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c index fbb9482..e601208 100644 --- a/libxfs/xfs_dir2_sf.c +++ b/libxfs/xfs_dir2_sf.c @@ -403,6 +403,7 @@ xfs_dir2_sf_addname_easy( memcpy(sfep->name, args->name, sfep->namelen); 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(offset); /* * Update the header and inode. @@ -494,6 +495,7 @@ xfs_dir2_sf_addname_hard( memcpy(sfep->name, args->name, sfep->namelen); 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(offset); sfp->count++; if (args->inumber > XFS_DIR2_MAX_SHORT_INUM && !objchange) sfp->i8count++; diff --git a/mkfs/proto.c b/mkfs/proto.c index bc38345..67c228a 100644 --- a/mkfs/proto.c +++ b/mkfs/proto.c @@ -331,7 +331,8 @@ newdirent( rsv = XFS_DIRENTER_SPACE_RES(mp, name->len); - error = -libxfs_dir_createname(tp, pip, name, inum, first, dfops, rsv); + error = -libxfs_dir_createname(tp, pip, name, inum, first, dfops, rsv, + NULL); if (error) fail(_("directory createname error"), error); } diff --git a/repair/phase6.c b/repair/phase6.c index 498a3b5..b41cc2b 100644 --- a/repair/phase6.c +++ b/repair/phase6.c @@ -1061,7 +1061,7 @@ mk_orphanage(xfs_mount_t *mp) * create the actual entry */ error = -libxfs_dir_createname(tp, pip, &xname, ip->i_ino, &first, - &dfops, nres); + &dfops, nres, NULL); if (error) do_error( _("can't make %s, createname error %d\n"), @@ -1170,7 +1170,7 @@ mv_orphanage( libxfs_defer_init(&dfops, &first); err = -libxfs_dir_createname(tp, orphanage_ip, &xname, - ino, &first, &dfops, nres); + ino, &first, &dfops, nres, NULL); if (err) do_error( _("name create failed in %s (%d), filesystem may be out of space\n"), @@ -1183,7 +1183,7 @@ mv_orphanage( libxfs_trans_log_inode(tp, orphanage_ip, XFS_ILOG_CORE); err = -libxfs_dir_createname(tp, ino_p, &xfs_name_dotdot, - orphanage_ino, &first, &dfops, nres); + orphanage_ino, &first, &dfops, nres, NULL); if (err) do_error( _("creation of .. entry failed (%d), filesystem may be out of space\n"), @@ -1214,7 +1214,7 @@ mv_orphanage( libxfs_defer_init(&dfops, &first); err = -libxfs_dir_createname(tp, orphanage_ip, &xname, - ino, &first, &dfops, nres); + ino, &first, &dfops, nres, NULL); if (err) do_error( _("name create failed in %s (%d), filesystem may be out of space\n"), @@ -1270,7 +1270,7 @@ mv_orphanage( libxfs_defer_init(&dfops, &first); err = -libxfs_dir_createname(tp, orphanage_ip, &xname, ino, - &first, &dfops, nres); + &first, &dfops, nres, NULL); if (err) do_error( _("name create failed in %s (%d), filesystem may be out of space\n"), @@ -1408,7 +1408,8 @@ longform_dir2_rebuild( libxfs_defer_init(&dfops, &firstblock); error = -libxfs_dir_createname(tp, ip, &p->name, p->inum, - &firstblock, &dfops, nres); + &firstblock, &dfops, nres, + NULL); if (error) { do_warn( _("name create failed in ino %" PRIu64 " (%d), filesystem may be out of space\n"), @@ -3011,7 +3012,7 @@ process_dir_inode( libxfs_defer_init(&dfops, &first); error = -libxfs_dir_createname(tp, ip, &xfs_name_dotdot, - ip->i_ino, &first, &dfops, nres); + ip->i_ino, &first, &dfops, nres, NULL); if (error) do_error( _("can't make \"..\" entry in root inode %" PRIu64 ", createname error %d\n"), ino, error); @@ -3069,7 +3070,7 @@ process_dir_inode( libxfs_defer_init(&dfops, &first); error = -libxfs_dir_createname(tp, ip, &xfs_name_dot, - ip->i_ino, &first, &dfops, nres); + ip->i_ino, &first, &dfops, nres, NULL); if (error) do_error( _("can't make \".\" entry in dir ino %" PRIu64 ", createname error %d\n"),