From patchwork Wed Sep 4 04:35:29 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: 11129285 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 0DF7D14E5 for ; Wed, 4 Sep 2019 04:37:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E16B822DBF for ; Wed, 4 Sep 2019 04:37:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="QFTlFAxB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725877AbfIDEhj (ORCPT ); Wed, 4 Sep 2019 00:37:39 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:47458 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725947AbfIDEhj (ORCPT ); Wed, 4 Sep 2019 00:37:39 -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 x844bR1A040003; Wed, 4 Sep 2019 04:37:37 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=+y+DGSW4kCFx66MAl8YycVqLkWyTSnxa1Lp3u+JYZt4=; b=QFTlFAxBN5t1SyDsa13nWuciB21dDqC7Y6cREHKy2E4f3V5FDywg873DxpAKgWivo1Hs itmL7qNv65E7diUERfccc+QpsRuHn82SesjWRCsbuWBj0ZvLsADBPBUk+jhYwDaz7xTj KWwowbdyPSNMVvNSuLgDuaOtaopawRtmOo4l/E0tPIwuLoMMcGezzCPfykhYtJPtrsLZ zUTn66pMhbEwZf3BB6GSTtYQD3BIxFGUEyQvJxMCoxccdwy4y4f9SytWZJiXktTmGRvX j0dVCUP//HT3s0NJ92KJ5ZhS2a5F3ZguCkfxhGVELPwR9u5mxnm88gzdtZgrzheujPlo AA== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 2ut6dd0010-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 Sep 2019 04:37:37 +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 x844XkCC163044; Wed, 4 Sep 2019 04:35:37 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3030.oracle.com with ESMTP id 2usu52bfu5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 Sep 2019 04:35:37 +0000 Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x844ZZfk030104; Wed, 4 Sep 2019 04:35:35 GMT Received: from localhost (/10.159.228.126) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 03 Sep 2019 21:35:35 -0700 Subject: [PATCH 7/8] libfrog: create xfd_open function From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Tue, 03 Sep 2019 21:35:29 -0700 Message-ID: <156757172971.1836891.18331324988390655813.stgit@magnolia> In-Reply-To: <156757168368.1836891.15043200811666785244.stgit@magnolia> References: <156757168368.1836891.15043200811666785244.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9369 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-1909040047 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9369 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-1909040047 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Create a helper to open a file and initialize the xfd structure. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fsr/xfs_fsr.c | 26 ++++++-------------------- include/fsgeom.h | 1 + libfrog/fsgeom.c | 22 ++++++++++++++++++++++ quota/quot.c | 7 ++++--- scrub/phase1.c | 25 ++++++++----------------- 5 files changed, 41 insertions(+), 40 deletions(-) diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index f7e7474d..64892dd5 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -593,18 +593,10 @@ fsrfs(char *mntdir, xfs_ino_t startino, int targetrange) return -1; } - if ((fsxfd.fd = open(mntdir, O_RDONLY)) < 0) { - fsrprintf(_("unable to open: %s: %s\n"), - mntdir, strerror( errno )); - free(fshandlep); - return -1; - } - - ret = xfd_prepare_geometry(&fsxfd); + ret = xfd_open(&fsxfd, mntdir, O_RDONLY); if (ret) { - fsrprintf(_("Skipping %s: could not get XFS geometry\n"), - mntdir); - xfd_close(&fsxfd); + fsrprintf(_("unable to open XFS file: %s: %s\n"), + mntdir, strerror(ret)); free(fshandlep); return -1; } @@ -726,16 +718,10 @@ fsrfile( * Need to open something on the same filesystem as the * file. Open the parent. */ - fsxfd.fd = open(getparent(fname), O_RDONLY); - if (fsxfd.fd < 0) { - fsrprintf(_("unable to open sys handle for %s: %s\n"), - fname, strerror(errno)); - goto out; - } - - error = xfd_prepare_geometry(&fsxfd); + error = xfd_open(&fsxfd, getparent(fname), O_RDONLY); if (error) { - fsrprintf(_("Unable to get geom on fs for: %s\n"), fname); + fsrprintf(_("unable to open sys handle for XFS file %s: %s\n"), + fname, strerror(error)); goto out; } diff --git a/include/fsgeom.h b/include/fsgeom.h index 771732f2..1c397cb6 100644 --- a/include/fsgeom.h +++ b/include/fsgeom.h @@ -42,6 +42,7 @@ struct xfs_fd { #define XFS_FD_INIT_EMPTY XFS_FD_INIT(-1) int xfd_prepare_geometry(struct xfs_fd *xfd); +int xfd_open(struct xfs_fd *xfd, const char *pathname, int flags); int xfd_close(struct xfs_fd *xfd); /* Convert AG number and AG inode number into fs inode number. */ diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c index 39604556..9a428bf6 100644 --- a/libfrog/fsgeom.c +++ b/libfrog/fsgeom.c @@ -116,6 +116,28 @@ xfd_prepare_geometry( return 0; } +/* Open a file on an XFS filesystem. Returns zero or a positive error code. */ +int +xfd_open( + struct xfs_fd *xfd, + const char *pathname, + int flags) +{ + int ret; + + xfd->fd = open(pathname, flags); + if (xfd->fd < 0) + return errno; + + ret = xfd_prepare_geometry(xfd); + if (ret) { + xfd_close(xfd); + return ret; + } + + return 0; +} + /* * Release any resources associated with this xfs_fd structure. Returns zero * or a positive error code. diff --git a/quota/quot.c b/quota/quot.c index 6fb6f833..b718b09d 100644 --- a/quota/quot.c +++ b/quota/quot.c @@ -132,7 +132,7 @@ quot_bulkstat_mount( struct xfs_bstat *buf; uint64_t last = 0; uint32_t count; - int i, sts; + int i, sts, ret; du_t **dp; /* @@ -147,8 +147,9 @@ quot_bulkstat_mount( *dp = NULL; ndu[0] = ndu[1] = ndu[2] = 0; - fsxfd.fd = open(fsdir, O_RDONLY); - if (fsxfd.fd < 0) { + ret = xfd_open(&fsxfd, fsdir, O_RDONLY); + if (ret) { + errno = ret; perror(fsdir); return; } diff --git a/scrub/phase1.c b/scrub/phase1.c index 6879cc33..81b0990d 100644 --- a/scrub/phase1.c +++ b/scrub/phase1.c @@ -84,13 +84,17 @@ xfs_setup_fs( * CAP_SYS_ADMIN, which we probably need to do anything fancy * with the (XFS driver) kernel. */ - ctx->mnt.fd = open(ctx->mntpoint, O_RDONLY | O_NOATIME | O_DIRECTORY); - if (ctx->mnt.fd < 0) { - if (errno == EPERM) + error = xfd_open(&ctx->mnt, ctx->mntpoint, + O_RDONLY | O_NOATIME | O_DIRECTORY); + if (error) { + if (error == EPERM) str_info(ctx, ctx->mntpoint, _("Must be root to run scrub.")); + else if (error == ENOTTY) + str_error(ctx, ctx->mntpoint, +_("Not an XFS filesystem.")); else - str_errno(ctx, ctx->mntpoint); + str_liberror(ctx, error, ctx->mntpoint); return false; } @@ -110,12 +114,6 @@ _("Must be root to run scrub.")); return false; } - if (!platform_test_xfs_fd(ctx->mnt.fd)) { - str_info(ctx, ctx->mntpoint, -_("Does not appear to be an XFS filesystem!")); - return false; - } - /* * Flush everything out to disk before we start checking. * This seems to reduce the incidence of stale file handle @@ -127,13 +125,6 @@ _("Does not appear to be an XFS filesystem!")); return false; } - /* Retrieve XFS geometry. */ - error = xfd_prepare_geometry(&ctx->mnt); - if (error) { - str_liberror(ctx, error, _("Retrieving XFS geometry")); - return false; - } - if (!xfs_action_lists_alloc(ctx->mnt.fsgeom.agcount, &ctx->action_lists)) { str_error(ctx, ctx->mntpoint, _("Not enough memory."));