From patchwork Mon Mar 14 00:15:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Satoru Takeuchi X-Patchwork-Id: 8574501 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E672B9F54C for ; Mon, 14 Mar 2016 00:16:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1222D20460 for ; Mon, 14 Mar 2016 00:16:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E682B2045E for ; Mon, 14 Mar 2016 00:16:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932936AbcCNAQR (ORCPT ); Sun, 13 Mar 2016 20:16:17 -0400 Received: from mgwym03.jp.fujitsu.com ([211.128.242.42]:26312 "EHLO mgwym03.jp.fujitsu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932426AbcCNAQQ (ORCPT ); Sun, 13 Mar 2016 20:16:16 -0400 Received: from yt-mxauth.gw.nic.fujitsu.com (unknown [192.168.229.68]) by mgwym03.jp.fujitsu.com with smtp id 1a0f_1768_197cef28_4fd1_4a4b_8d5c_3f2564d420f1; Mon, 14 Mar 2016 09:16:12 +0900 Received: from m3051.s.css.fujitsu.com (m3051.s.css.fujitsu.com [10.134.21.209]) by yt-mxauth.gw.nic.fujitsu.com (Postfix) with ESMTP id 7BC70AC050B for ; Mon, 14 Mar 2016 09:16:10 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v2.4.6 X-SHieldMailCheckerPolicyVersion: FJ-ISEC-20160122 X-SHieldMailCheckerMailID: 20f0acb5981d42cda688a3775edb6af9 Subject: [PATCH 3/4] btrfs-progs: Fix a regression that btrfs filesystem label doesn't work To: "linux-btrfs@vger.kernel.org" References: <56E5FF9A.4020609@jp.fujitsu.com> From: Satoru Takeuchi Message-ID: <56E602AE.7080203@jp.fujitsu.com> Date: Mon, 14 Mar 2016 09:15:42 +0900 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <56E5FF9A.4020609@jp.fujitsu.com> X-TM-AS-MML: disable Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The number of arguments which is allowed to pass became wrong from the following commit. commit 176aeca9a148c5e29de0 ("btrfs-progs: add getopt stubs where needed") * actual result =========================================================== # ./btrfs prop get /btrfs label label=foo # ./btrfs fi label /btrfs btrfs filesystem label: too few arguments usage: btrfs filesystem label [|] [] Get or change the label of a filesystem With one argument, get the label of filesystem on . If is passed, set the filesystem label to . # ./btrfs fi label /btrfs bar foo # ./btrfs prop get /btrfs label label=foo =========================================================== * expected result =========================================================== # ./btrfs prop get /btrfs label label=foo # ./btrfs fi label /btrfs foo # ./btrfs fi label /btrfs bar # ./btrfs prop get /btrfs label label=bar =========================================================== Signed-off-by: Satoru Takeuchi --- cmds-filesystem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 7e74e1b..45c16d2 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -1255,11 +1255,11 @@ static int cmd_filesystem_label(int argc, char **argv) { clean_args_no_options(argc, argv, cmd_filesystem_label_usage); - if (check_argc_min(argc - optind, 2) || - check_argc_max(argc - optind, 3)) + if (check_argc_min(argc - optind, 1) || + check_argc_max(argc - optind, 2)) usage(cmd_filesystem_label_usage); - if (argc - optind > 2) { + if (argc - optind > 1) { return set_label(argv[optind], argv[optind + 1]); } else { char label[BTRFS_LABEL_SIZE];