From patchwork Fri Aug 30 04:21:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11122891 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A414F1399 for ; Fri, 30 Aug 2019 04:21:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77602233FF for ; Fri, 30 Aug 2019 04:21:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="qvzGyYtl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726090AbfH3EVl (ORCPT ); Fri, 30 Aug 2019 00:21:41 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:38784 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725819AbfH3EVk (ORCPT ); Fri, 30 Aug 2019 00:21:40 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x7U4IjH2103433; Fri, 30 Aug 2019 04:21:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2019-08-05; bh=JVaPi0UJPZuq3eVN4A6GtxbTMBsp47Zckf7EVXaKEvU=; b=qvzGyYtlBKmyhPdP+oroNoDXXEROpcllAn0iSaeC13tABtYXPnE7fwgaZjC1vSONdXGD NjJQBkFfxzQdoDyKC2ULKUXHonFZXewpemfqPPj+jMwIU5sBPSHCKcJoTnmq1HYZ3Id5 4TTRTFnz8GSWS6tcNndlSwSUGyMGu91WmK/hFMI/9+4SX0iIDcEjKmjhAMSpXoOBiDYF q+OFb90tReM1TJsxnakPN5ZAKPm1A9/EMyLWN/CXUlDd8x7+AWDPrR4CcMmUHe3cGDxS IF6RD//jHzGx3e7PiX92SeXhNsGPHZ8CtZB4reCIQrzBx1u4QSLlow6OaP5mEQpIrNgX jA== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 2upvj7g1df-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2019 04:21:24 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x7U4IZVe132444; Fri, 30 Aug 2019 04:21:24 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3030.oracle.com with ESMTP id 2unvu0y94t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2019 04:21:24 +0000 Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x7U4LNFW009600; Fri, 30 Aug 2019 04:21:23 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 29 Aug 2019 21:21:23 -0700 Subject: [PATCH 9/9] libfrog: refactor open-coded INUMBERS calls From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, Dave Chinner Date: Thu, 29 Aug 2019 21:21:22 -0700 Message-ID: <156713888219.386621.15662668758929652470.stgit@magnolia> In-Reply-To: <156713882070.386621.8501281965010809034.stgit@magnolia> References: <156713882070.386621.8501281965010809034.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9364 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 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-1906280000 definitions=main-1908300043 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9364 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908300043 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Refactor all the INUMBERS ioctl callsites into helper functions. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Reviewed-by: Allison Collins --- include/xfrog.h | 4 ++++ io/imap.c | 33 ++++++++++++++++----------------- io/open.c | 24 ++++++++++++------------ libfrog/bulkstat.c | 26 ++++++++++++++++++++++++++ scrub/fscounters.c | 20 ++++++++------------ scrub/inodes.c | 17 ++++++----------- 6 files changed, 72 insertions(+), 52 deletions(-) diff --git a/include/xfrog.h b/include/xfrog.h index 3a49acc3..d16481ce 100644 --- a/include/xfrog.h +++ b/include/xfrog.h @@ -116,4 +116,8 @@ int xfrog_bulkstat_single(struct xfs_fd *xfd, uint64_t ino, int xfrog_bulkstat(struct xfs_fd *xfd, uint64_t *lastino, uint32_t icount, struct xfs_bstat *ubuffer, uint32_t *ocount); +struct xfs_inogrp; +int xfrog_inumbers(struct xfs_fd *xfd, uint64_t *lastino, uint32_t icount, + struct xfs_inogrp *ubuffer, uint32_t *ocount); + #endif /* __XFROG_H__ */ diff --git a/io/imap.c b/io/imap.c index 9667289a..053ac28e 100644 --- a/io/imap.c +++ b/io/imap.c @@ -8,18 +8,20 @@ #include "input.h" #include "init.h" #include "io.h" +#include "xfrog.h" static cmdinfo_t imap_cmd; static int imap_f(int argc, char **argv) { - int count; - int nent; - int i; - __u64 last = 0; - struct xfs_inogrp *t; - struct xfs_fsop_bulkreq bulkreq; + struct xfs_fd xfd = XFS_FD_INIT(file->fd); + struct xfs_inogrp *t; + uint64_t last = 0; + uint32_t count; + uint32_t nent; + int i; + int error; if (argc != 2) nent = 1; @@ -30,14 +32,8 @@ imap_f(int argc, char **argv) if (!t) return 0; - bulkreq.lastip = &last; - bulkreq.icount = nent; - bulkreq.ubuffer = (void *)t; - bulkreq.ocount = &count; - - while (xfsctl(file->name, file->fd, XFS_IOC_FSINUMBERS, &bulkreq) == 0) { - if (count == 0) - goto out_free; + while ((error = xfrog_inumbers(&xfd, &last, nent, t, &count)) == 0 && + count > 0) { for (i = 0; i < count; i++) { printf(_("ino %10llu count %2d mask %016llx\n"), (unsigned long long)t[i].xi_startino, @@ -45,9 +41,12 @@ imap_f(int argc, char **argv) (unsigned long long)t[i].xi_allocmask); } } - perror("xfsctl(XFS_IOC_FSINUMBERS)"); - exitcode = 1; -out_free: + + if (error) { + errno = error; + perror("xfsctl(XFS_IOC_FSINUMBERS)"); + exitcode = 1; + } free(t); return 0; } diff --git a/io/open.c b/io/open.c index 35e6131b..c0d0f1e9 100644 --- a/io/open.c +++ b/io/open.c @@ -675,24 +675,24 @@ inode_help(void) "\n")); } +#define IGROUP_NR (1024) static __u64 get_last_inode(void) { - __u64 lastip = 0; - __u64 lastgrp = 0; - __s32 ocount = 0; + struct xfs_fd xfd = XFS_FD_INIT(file->fd); + uint64_t lastip = 0; + uint32_t lastgrp = 0; + uint32_t ocount = 0; __u64 last_ino; - struct xfs_inogrp igroup[1024]; - struct xfs_fsop_bulkreq bulkreq; - - bulkreq.lastip = &lastip; - bulkreq.ubuffer = &igroup; - bulkreq.icount = sizeof(igroup) / sizeof(struct xfs_inogrp); - bulkreq.ocount = &ocount; + struct xfs_inogrp igroup[IGROUP_NR]; for (;;) { - if (xfsctl(file->name, file->fd, XFS_IOC_FSINUMBERS, - &bulkreq)) { + int ret; + + ret = xfrog_inumbers(&xfd, &lastip, IGROUP_NR, igroup, + &ocount); + if (ret) { + errno = ret; perror("XFS_IOC_FSINUMBERS"); return 0; } diff --git a/libfrog/bulkstat.c b/libfrog/bulkstat.c index 0e11ccea..18fffb20 100644 --- a/libfrog/bulkstat.c +++ b/libfrog/bulkstat.c @@ -50,3 +50,29 @@ xfrog_bulkstat( return errno; return 0; } + +/* + * Query inode allocation bitmask information. Returns zero or a positive + * error code. + */ +int +xfrog_inumbers( + struct xfs_fd *xfd, + uint64_t *lastino, + uint32_t icount, + struct xfs_inogrp *ubuffer, + uint32_t *ocount) +{ + struct xfs_fsop_bulkreq bulkreq = { + .lastip = (__u64 *)lastino, + .icount = icount, + .ubuffer = ubuffer, + .ocount = (__s32 *)ocount, + }; + int ret; + + ret = ioctl(xfd->fd, XFS_IOC_FSINUMBERS, &bulkreq); + if (ret) + return errno; + return 0; +} diff --git a/scrub/fscounters.c b/scrub/fscounters.c index ea6af156..3915822e 100644 --- a/scrub/fscounters.c +++ b/scrub/fscounters.c @@ -15,6 +15,7 @@ #include "xfs_scrub.h" #include "common.h" #include "fscounters.h" +#include "xfrog.h" /* * Filesystem counter collection routines. We can count the number of @@ -41,30 +42,25 @@ xfs_count_inodes_range( uint64_t last_ino, uint64_t *count) { - struct xfs_fsop_bulkreq igrpreq = {NULL}; struct xfs_inogrp inogrp; - __u64 igrp_ino; + uint64_t igrp_ino; uint64_t nr = 0; - __s32 igrplen = 0; + uint32_t igrplen = 0; int error; ASSERT(!(first_ino & (XFS_INODES_PER_CHUNK - 1))); ASSERT((last_ino & (XFS_INODES_PER_CHUNK - 1))); - igrpreq.lastip = &igrp_ino; - igrpreq.icount = 1; - igrpreq.ubuffer = &inogrp; - igrpreq.ocount = &igrplen; - igrp_ino = first_ino; - error = ioctl(ctx->mnt.fd, XFS_IOC_FSINUMBERS, &igrpreq); - while (!error && igrplen && inogrp.xi_startino < last_ino) { + while (!(error = xfrog_inumbers(&ctx->mnt, &igrp_ino, 1, &inogrp, + &igrplen))) { + if (igrplen == 0 || inogrp.xi_startino >= last_ino) + break; nr += inogrp.xi_alloccount; - error = ioctl(ctx->mnt.fd, XFS_IOC_FSINUMBERS, &igrpreq); } if (error) { - str_errno(ctx, descr); + str_liberror(ctx, error, descr); return false; } diff --git a/scrub/inodes.c b/scrub/inodes.c index 413037d8..acad9b16 100644 --- a/scrub/inodes.c +++ b/scrub/inodes.c @@ -90,16 +90,15 @@ xfs_iterate_inodes_range( xfs_inode_iter_fn fn, void *arg) { - struct xfs_fsop_bulkreq igrpreq = {NULL}; struct xfs_handle handle; struct xfs_inogrp inogrp; struct xfs_bstat bstat[XFS_INODES_PER_CHUNK]; char idescr[DESCR_BUFSZ]; struct xfs_bstat *bs; - __u64 igrp_ino; + uint64_t igrp_ino; uint64_t ino; uint32_t bulklen = 0; - __s32 igrplen = 0; + uint32_t igrplen = 0; bool moveon = true; int i; int error; @@ -108,11 +107,6 @@ xfs_iterate_inodes_range( memset(bstat, 0, XFS_INODES_PER_CHUNK * sizeof(struct xfs_bstat)); - igrpreq.lastip = &igrp_ino; - igrpreq.icount = 1; - igrpreq.ubuffer = &inogrp; - igrpreq.ocount = &igrplen; - memcpy(&handle.ha_fsid, fshandle, sizeof(handle.ha_fsid)); handle.ha_fid.fid_len = sizeof(xfs_fid_t) - sizeof(handle.ha_fid.fid_len); @@ -120,7 +114,7 @@ xfs_iterate_inodes_range( /* Find the inode chunk & alloc mask */ igrp_ino = first_ino; - error = ioctl(ctx->mnt.fd, XFS_IOC_FSINUMBERS, &igrpreq); + error = xfrog_inumbers(&ctx->mnt, &igrp_ino, 1, &inogrp, &igrplen); while (!error && igrplen) { /* Load the inodes. */ ino = inogrp.xi_startino - 1; @@ -176,12 +170,13 @@ _("Changed too many times during scan; giving up.")); stale_count = 0; igrp_retry: - error = ioctl(ctx->mnt.fd, XFS_IOC_FSINUMBERS, &igrpreq); + error = xfrog_inumbers(&ctx->mnt, &igrp_ino, 1, &inogrp, + &igrplen); } err: if (error) { - str_errno(ctx, descr); + str_liberror(ctx, error, descr); moveon = false; } out: