From patchwork Fri Mar 18 01:26:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Satoru Takeuchi X-Patchwork-Id: 8615461 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E8D08C0554 for ; Fri, 18 Mar 2016 01:26:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA74620155 for ; Fri, 18 Mar 2016 01:26:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F250620172 for ; Fri, 18 Mar 2016 01:26:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751922AbcCRB0d (ORCPT ); Thu, 17 Mar 2016 21:26:33 -0400 Received: from mgwkm01.jp.fujitsu.com ([202.219.69.168]:63446 "EHLO mgwkm01.jp.fujitsu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750912AbcCRB0c (ORCPT ); Thu, 17 Mar 2016 21:26:32 -0400 Received: from kw-mxq.gw.nic.fujitsu.com (unknown [192.168.231.130]) by mgwkm01.jp.fujitsu.com with smtp id 50c7_6051_230b7ead_ea9d_446e_a87e_c77843622d1b; Fri, 18 Mar 2016 10:26:23 +0900 Received: from m3051.s.css.fujitsu.com (m3051.s.css.fujitsu.com [10.134.21.209]) by kw-mxq.gw.nic.fujitsu.com (Postfix) with ESMTP id 12BF0AC0418 for ; Fri, 18 Mar 2016 10:26:23 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v2.4.6 X-SHieldMailCheckerPolicyVersion: FJ-ISEC-20160122 X-SHieldMailCheckerMailID: e6449795297e464db11e605fc290f05d Subject: [PATCH 1/5] btrfs-progs: "sub get-default" doesn't work To: dsterba@suse.cz, linux-btrfs@vger.kernel.org, clm@fb.com References: <20160316182941.GR21722@suse.cz> From: Satoru Takeuchi Message-ID: <56EB5937.8070208@jp.fujitsu.com> Date: Fri, 18 Mar 2016 10:26:15 +0900 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 In-Reply-To: <20160316182941.GR21722@suse.cz> 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=ham 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 On 2016/03/17 3:29, David Sterba wrote: > Hi, > > btrfs-progs 4.5-rc1 have been released. The ETA for final release is this > Friday, so please test and report if you find problems. Small fixes or > documentation updates are welcome. Please apply this patchset. Especially [1/5]~[4/5] fix the regressions caused by the following commit. commit 176aeca9a148 ("btrfs-progs: add getopt stubs where needed") I read whole this commit carefully and probably fixed all problems in this commit by 1a521af, c742deb, and this patchset. Satoru --- "sub get-default" does't work from the following commit. commit 176aeca9a148 ("btrfs-progs: add getopt stubs where needed") * actual result ================================================== # ./btrfs sub get-default /btrfs btrfs subvolume get-default: too few arguments usage: btrfs subvolume get-default Get the default subvolume of a filesystem ================================================== * expected result ================================================== # btrfs sub get-default /btrfs ID 5 (FS_TREE) ================================================== Signed-off-by: Satoru Takeuchi --- This patch can be applied to devel branch (commit: 40dc7c504cf0) --- cmds-subvolume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmds-subvolume.c b/cmds-subvolume.c index 32caaa5..3953d7c 100644 --- a/cmds-subvolume.c +++ b/cmds-subvolume.c @@ -790,7 +790,7 @@ static int cmd_subvol_get_default(int argc, char **argv) clean_args_no_options(argc, argv, cmd_subvol_get_default_usage); - if (check_argc_exact(argc - optind, 2)) + if (check_argc_exact(argc - optind, 1)) usage(cmd_subvol_get_default_usage); subvol = argv[1];