From patchwork Wed May 16 21:38:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Mahoney X-Patchwork-Id: 10404937 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 7E512602C2 for ; Wed, 16 May 2018 21:39:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DBA4286E6 for ; Wed, 16 May 2018 21:39:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6295E28755; Wed, 16 May 2018 21:39:50 +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.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 00761286E6 for ; Wed, 16 May 2018 21:39:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752135AbeEPVjs (ORCPT ); Wed, 16 May 2018 17:39:48 -0400 Received: from mx2.suse.de ([195.135.220.15]:52636 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750953AbeEPVjD (ORCPT ); Wed, 16 May 2018 17:39:03 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C77F3ACBF for ; Wed, 16 May 2018 21:39:01 +0000 (UTC) Received: from starscream.home.jeffm.io (starscream-1.home.jeffm.io [192.168.1.254]) by mail.home.jeffm.io (Postfix) with ESMTPS id DA16281AD3E3; Wed, 16 May 2018 17:38:30 -0400 (EDT) Received: by starscream.home.jeffm.io (Postfix, from userid 1000) id 79D97803CB; Wed, 16 May 2018 17:39:00 -0400 (EDT) From: jeffm@suse.com To: linux-btrfs@vger.kernel.org Cc: Jeff Mahoney Subject: [PATCH 01/18] btrfs-progs: quota: Add -W option to rescan to wait without starting rescan Date: Wed, 16 May 2018 17:38:34 -0400 Message-Id: <20180516213851.10196-2-jeffm@suse.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180516213851.10196-1-jeffm@suse.com> References: <20180516213851.10196-1-jeffm@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Mahoney This patch adds a new -W option to wait for a rescan without starting a new operation. This is useful for things like xfstests where we want do to do a "btrfs quota enable" and not continue until the subsequent rescan has finished. In addition to documenting the new option in the man page, I've cleaned up the rescan entry to document the -w option a bit better. Reviewed-by: Qu Wenruo Signed-off-by: Jeff Mahoney --- Documentation/btrfs-quota.asciidoc | 10 +++++++--- cmds-quota.c | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Documentation/btrfs-quota.asciidoc b/Documentation/btrfs-quota.asciidoc index 85ebf729..0b64a69b 100644 --- a/Documentation/btrfs-quota.asciidoc +++ b/Documentation/btrfs-quota.asciidoc @@ -238,15 +238,19 @@ Disable subvolume quota support for a filesystem. *enable* :: Enable subvolume quota support for a filesystem. -*rescan* [-s] :: +*rescan* [-s|-w|-W] :: Trash all qgroup numbers and scan the metadata again with the current config. + `Options` + -s:::: -show status of a running rescan operation. +Show status of a running rescan operation. + -w:::: -wait for rescan operation to finish(can be already in progress). +Start rescan operation and wait until it has finished before exiting. If a rescan is already running, wait until it finishes and then exit without starting a new one. + +-W:::: +Wait for rescan operation to finish and then exit. If a rescan is not already running, exit silently. EXIT STATUS ----------- diff --git a/cmds-quota.c b/cmds-quota.c index 745889d1..7f933495 100644 --- a/cmds-quota.c +++ b/cmds-quota.c @@ -120,14 +120,20 @@ static int cmd_quota_rescan(int argc, char **argv) int wait_for_completion = 0; while (1) { - int c = getopt(argc, argv, "sw"); + int c = getopt(argc, argv, "swW"); if (c < 0) break; switch (c) { case 's': ioctlnum = BTRFS_IOC_QUOTA_RESCAN_STATUS; break; + case 'W': + ioctlnum = 0; + wait_for_completion = 1; + break; case 'w': + /* Reset it in case the user did both -W and -w */ + ioctlnum = BTRFS_IOC_QUOTA_RESCAN; wait_for_completion = 1; break; default: @@ -135,8 +141,8 @@ static int cmd_quota_rescan(int argc, char **argv) } } - if (ioctlnum != BTRFS_IOC_QUOTA_RESCAN && wait_for_completion) { - error("switch -w cannot be used with -s"); + if (ioctlnum == BTRFS_IOC_QUOTA_RESCAN_STATUS && wait_for_completion) { + error("switches -w/-W cannot be used with -s"); return 1; } @@ -150,8 +156,10 @@ static int cmd_quota_rescan(int argc, char **argv) if (fd < 0) return 1; - ret = ioctl(fd, ioctlnum, &args); - e = errno; + if (ioctlnum) { + ret = ioctl(fd, ioctlnum, &args); + e = errno; + } if (ioctlnum == BTRFS_IOC_QUOTA_RESCAN_STATUS) { close_file_or_dir(fd, dirstream); @@ -167,7 +175,7 @@ static int cmd_quota_rescan(int argc, char **argv) return 0; } - if (ret == 0) { + if (ioctlnum == BTRFS_IOC_QUOTA_RESCAN && ret == 0) { printf("quota rescan started\n"); fflush(stdout); } else if (ret < 0 && (!wait_for_completion || e != EINPROGRESS)) {