From patchwork Mon Apr 9 03:38:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gu Jinxiang X-Patchwork-Id: 10330309 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 A5EFF6053C for ; Mon, 9 Apr 2018 03:42:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99E0F28972 for ; Mon, 9 Apr 2018 03:42:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D54328A37; Mon, 9 Apr 2018 03:42:09 +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 06AF828972 for ; Mon, 9 Apr 2018 03:42:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754318AbeDIDmF (ORCPT ); Sun, 8 Apr 2018 23:42:05 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:56840 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753076AbeDIDmE (ORCPT ); Sun, 8 Apr 2018 23:42:04 -0400 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="38696883" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 09 Apr 2018 11:42:00 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id A38FF48AE782 for ; Mon, 9 Apr 2018 11:41:56 +0800 (CST) Received: from ubuntu.g08.fujitsu.local (10.167.226.132) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 9 Apr 2018 11:41:58 +0800 From: Gu Jinxiang To: Subject: [PATCH] btrfs-progs: mark -f option of btrfs scrub start deprecated Date: Mon, 9 Apr 2018 11:38:09 +0800 Message-ID: <1523245089-2788-1-git-send-email-gujx@cn.fujitsu.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.167.226.132] X-yoursite-MailScanner-ID: A38FF48AE782.A8C4B X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: gujx@cn.fujitsu.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 Since in the commit below detect the scrub information automatically, -f option is no more need. Let's make it deprecated. commit d5fd05a773e2 ("btrfs-progs: scrub, detect stale information in the status file") Signed-off-by: Gu Jinxiang --- Documentation/btrfs-scrub.asciidoc | 9 ++++++--- cmds-scrub.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation/btrfs-scrub.asciidoc b/Documentation/btrfs-scrub.asciidoc index d2d20627..89bca18e 100644 --- a/Documentation/btrfs-scrub.asciidoc +++ b/Documentation/btrfs-scrub.asciidoc @@ -75,9 +75,12 @@ set IO priority class (see `ionice`(1) manpage) -n :::: set IO priority classdata (see `ionice`(1) manpage) -f:::: -force starting new scrub even if a scrub is already running, -this can useful when scrub status file is damaged and reports a running -scrub although it is not, but should not normally be necessary +*deprecated, will be removed.* ++ +An option to force starting new scrub when scrub status file is damaged and +reports a running scrub although it is not, since whether a scrub is really +running can be judged automatically now, this option should not be necessary +anymore. *status* [-d] |:: Show status of a running scrub for the filesystem identified by 'path' or diff --git a/cmds-scrub.c b/cmds-scrub.c index 6b909f20..8cf1e5df 100644 --- a/cmds-scrub.c +++ b/cmds-scrub.c @@ -1569,7 +1569,7 @@ static const char * const cmd_scrub_start_usage[] = { "-R raw print mode, print full data instead of summary", "-c set ioprio class (see ionice(1) manpage)", "-n set ioprio classdata (see ionice(1) manpage)", - "-f force starting new scrub even if a scrub is already running", + "-f (deprecated) force starting new scrub even if a scrub is already running", " this is useful when scrub stats record file is damaged", NULL };