From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99431C6FD1F for ; Thu, 16 Mar 2023 19:31:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229925AbjCPTbN (ORCPT ); Thu, 16 Mar 2023 15:31:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230308AbjCPTbL (ORCPT ); Thu, 16 Mar 2023 15:31:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1197FB3E3A for ; Thu, 16 Mar 2023 12:31:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 916A6620E3 for ; Thu, 16 Mar 2023 19:31:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0186CC433D2; Thu, 16 Mar 2023 19:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678995067; bh=c6auRToVaNNYmSLiv4nwAtuK3O3YAVKeu7FKIlu4TZQ=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=Nne4U4+17EDN5+ivuj0/OLB20DNAYmZzmO0WFdlN+a6numWv1J3ZzV9Jgm5nMYpS8 FNOFavIVxFwBwj9f/TmC+Wk9c+PT2uzasyHdEGODdtgJATGKCMI3xXCBS9nSFc2OrA MQXcpRMHgnVdeMIDKh5ZbVAmX69mnQhYEKkl2aq8q4sRs10cpzpUa1+3fSxcGob7jk vG8zBJd/cpsiQp8QFN2AFPURNM3yYU8JCLGZAhadUb7RQwnJC1Pu/2HNLoqX2VAxPA US3PBODY2ys+lLdvbhimhMAHsf572DCV4WljmIAsQXeL7c6C3JYQz5hfRQjzlRv1ct N80EsxOUei0mQ== Date: Thu, 16 Mar 2023 12:31:06 -0700 Subject: [PATCH 2/5] xfs: rename xfs_parent_ptr From: "Darrick J. Wong" To: djwong@kernel.org Cc: allison.henderson@oracle.com, linux-xfs@vger.kernel.org Message-ID: <167899416483.16836.14425559739641149843.stgit@frogsfrogsfrogs> In-Reply-To: <167899416457.16836.2981078472584318439.stgit@frogsfrogsfrogs> References: <167899416457.16836.2981078472584318439.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Change the name to xfs_getparents_rec so that the name matches the head structure. Signed-off-by: Darrick J. Wong --- io/parent.c | 18 +++++++++--------- libfrog/pptrs.c | 12 ++++++------ libfrog/pptrs.h | 2 +- libxfs/xfs_fs.h | 20 ++++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/io/parent.c b/io/parent.c index 1c1453f2c..7b9eed8b8 100644 --- a/io/parent.c +++ b/io/parent.c @@ -25,7 +25,7 @@ struct pptr_args { static int pptr_print( struct xfs_getparents *pi, - struct xfs_parent_ptr *pptr, + struct xfs_getparents_rec *pptr, void *arg) { struct pptr_args *args = arg; @@ -36,21 +36,21 @@ pptr_print( return 0; } - if (args->filter_ino && pptr->xpp_ino != args->filter_ino) + if (args->filter_ino && pptr->gpr_ino != args->filter_ino) return 0; - if (args->filter_name && strcmp(args->filter_name, pptr->xpp_name)) + if (args->filter_name && strcmp(args->filter_name, pptr->gpr_name)) return 0; - namelen = strlen(pptr->xpp_name); + namelen = strlen(pptr->gpr_name); if (args->shortformat) { printf("%llu/%u/%u/%s\n", - (unsigned long long)pptr->xpp_ino, - (unsigned int)pptr->xpp_gen, namelen, pptr->xpp_name); + (unsigned long long)pptr->gpr_ino, + (unsigned int)pptr->gpr_gen, namelen, pptr->gpr_name); } else { - printf(_("p_ino = %llu\n"), (unsigned long long)pptr->xpp_ino); - printf(_("p_gen = %u\n"), (unsigned int)pptr->xpp_gen); + printf(_("p_ino = %llu\n"), (unsigned long long)pptr->gpr_ino); + printf(_("p_gen = %u\n"), (unsigned int)pptr->gpr_gen); printf(_("p_reclen = %u\n"), namelen); - printf(_("p_name = \"%s\"\n\n"), pptr->xpp_name); + printf(_("p_name = \"%s\"\n\n"), pptr->gpr_name); } return 0; } diff --git a/libfrog/pptrs.c b/libfrog/pptrs.c index e292ced19..eff994df8 100644 --- a/libfrog/pptrs.c +++ b/libfrog/pptrs.c @@ -37,7 +37,7 @@ handle_walk_parents( void *arg) { struct xfs_getparents *pi; - struct xfs_parent_ptr *p; + struct xfs_getparents_rec *p; unsigned int i; ssize_t ret = -1; @@ -128,7 +128,7 @@ static int handle_walk_parent_paths(struct walk_ppaths_info *wpi, static int handle_walk_parent_path_ptr( struct xfs_getparents *pi, - struct xfs_parent_ptr *p, + struct xfs_getparents_rec *p, void *arg) { struct walk_ppath_level_info *wpli = arg; @@ -138,13 +138,13 @@ handle_walk_parent_path_ptr( if (pi->gp_flags & XFS_GETPARENTS_OFLAG_ROOT) return wpi->fn(wpi->mntpt, wpi->path, wpi->arg); - ret = path_component_change(wpli->pc, p->xpp_name, - strlen((char *)p->xpp_name), p->xpp_ino); + ret = path_component_change(wpli->pc, p->gpr_name, + strlen((char *)p->gpr_name), p->gpr_ino); if (ret) return ret; - wpli->newhandle.ha_fid.fid_ino = p->xpp_ino; - wpli->newhandle.ha_fid.fid_gen = p->xpp_gen; + wpli->newhandle.ha_fid.fid_ino = p->gpr_ino; + wpli->newhandle.ha_fid.fid_gen = p->gpr_gen; path_list_add_parent_component(wpi->path, wpli->pc); ret = handle_walk_parent_paths(wpi, &wpli->newhandle); diff --git a/libfrog/pptrs.h b/libfrog/pptrs.h index ab1d0f2fa..05aaea60b 100644 --- a/libfrog/pptrs.h +++ b/libfrog/pptrs.h @@ -9,7 +9,7 @@ struct path_list; typedef int (*walk_pptr_fn)(struct xfs_getparents *pi, - struct xfs_parent_ptr *pptr, void *arg); + struct xfs_getparents_rec *pptr, void *arg); typedef int (*walk_ppath_fn)(const char *mntpt, struct path_list *path, void *arg); diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h index c34303a39..c8edc7c09 100644 --- a/libxfs/xfs_fs.h +++ b/libxfs/xfs_fs.h @@ -768,12 +768,12 @@ struct xfs_scrub_metadata { XFS_GETPARENTS_OFLAG_DONE) /* Get an inode parent pointer through ioctl */ -struct xfs_parent_ptr { - __u64 xpp_ino; /* Inode */ - __u32 xpp_gen; /* Inode generation */ - __u32 xpp_diroffset; /* Directory offset */ - __u64 xpp_rsvd; /* Reserved */ - __u8 xpp_name[]; /* File name */ +struct xfs_getparents_rec { + __u64 gpr_ino; /* Inode */ + __u32 gpr_gen; /* Inode generation */ + __u32 gpr_diroffset; /* Directory offset */ + __u64 gpr_rsvd; /* Reserved */ + __u8 gpr_name[]; /* File name */ }; /* Iterate through an inodes parent pointers */ @@ -811,15 +811,15 @@ static inline size_t xfs_getparents_sizeof(int nr_ptrs) { return sizeof(struct xfs_getparents) + - (nr_ptrs * sizeof(struct xfs_parent_ptr)); + (nr_ptrs * sizeof(struct xfs_getparents_rec)); } -static inline struct xfs_parent_ptr* +static inline struct xfs_getparents_rec* xfs_getparents_rec( struct xfs_getparents *info, int idx) { - return (struct xfs_parent_ptr *)((char *)info + info->gp_offsets[idx]); + return (struct xfs_getparents_rec *)((char *)info + info->gp_offsets[idx]); } /* @@ -867,7 +867,7 @@ xfs_getparents_rec( /* XFS_IOC_GETFSMAP ------ hoisted 59 */ #define XFS_IOC_SCRUB_METADATA _IOWR('X', 60, struct xfs_scrub_metadata) #define XFS_IOC_AG_GEOMETRY _IOWR('X', 61, struct xfs_ag_geometry) -#define XFS_IOC_GETPARENTS _IOWR('X', 62, struct xfs_parent_ptr) +#define XFS_IOC_GETPARENTS _IOWR('X', 62, struct xfs_getparents_rec) /* * ioctl commands that replace IRIX syssgi()'s