[1/5] btrfs-progs: "sub get-default" doesn't work

Commit Message

Satoru Takeuchi March 18, 2016, 1:26 a.m. UTC

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 <path>

       Get the default subvolume of a filesystem
   ==================================================

* expected result

   ==================================================
   # btrfs sub get-default /btrfs
   ID 5 (FS_TREE)
   ==================================================

Signed-off-by: Satoru Takeuchi <[e-mail]>
---
This patch can be applied to devel branch (commit: 40dc7c504cf0)
---
  cmds-subvolume.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Sterba March 18, 2016, 1:26 p.m. UTC | #1

On Fri, Mar 18, 2016 at 10:26:15AM +0900, Satoru Takeuchi wrote:
> On 2016/03/17 3:29, David Sterba wrote:
> > 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.

All applied, thanks. I've updated the subject lines and did minor code
reformatting.  And thanks for fixing the mess after 176aeca9a148, we
need more ui coverage tests.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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];