| Message ID | 201612070755.AA00022@WIN-5MHF4RKU941.jp.fujitsu.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Dec 07, 2016 at 04:55:15PM +0900, Tsutomu Itoh wrote: > The 'qgroup show' command does not synchronize filesystem. > Therefore, 'qgroup show' may not display the correct value unless > synchronized with 'filesystem sync' command etc. > > So add the '--sync' and '--no-sync' options so that we can choose > whether or not to synchronize when executing the command. > > Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> > --- > v2: use getopt_long with enum instead of single letter (suggested by Qu) > --- > Documentation/btrfs-qgroup.asciidoc | 6 ++++++ > cmds-qgroup.c | 33 +++++++++++++++++++++++++++++---- > 2 files changed, 35 insertions(+), 4 deletions(-) > > diff --git a/Documentation/btrfs-qgroup.asciidoc b/Documentation/btrfs-qgroup.asciidoc > index 438dbc7..9c65795 100644 > --- a/Documentation/btrfs-qgroup.asciidoc > +++ b/Documentation/btrfs-qgroup.asciidoc > @@ -126,6 +126,12 @@ Prefix \'+' means ascending order and \'-' means descending order of <attr>. > If no prefix is given, use ascending order by default. > + > If multiple <attr>s is given, use comma to separate. > ++ > +--sync:::: > +To retrieve information after updating the status of qgroups, > +invoke sync before getting information. This could be more specific, that it's a filesystem sync. > +--no-sync:::: > +Do not invoke sync before getting information (default). I'm not sure we need this option, how is it supposed to be used? > @@ -311,8 +313,15 @@ static int cmd_qgroup_show(int argc, char **argv) > > while (1) { > int c; > + enum { > + GETOPT_VAL_SORT = 256, > + GETOPT_VAL_SYNC, > + GETOPT_VAL_NO_SYNC > + }; > static const struct option long_options[] = { > - {"sort", required_argument, NULL, 'S'}, > + {"sort", required_argument, NULL, GETOPT_VAL_SORT}, This change is unrelated to the patch, please make a separate patch for that. Otherwise looks good. > + {"sync", no_argument, NULL, GETOPT_VAL_SYNC}, > + {"no-sync", no_argument, NULL, GETOPT_VAL_NO_SYNC}, > { NULL, 0, NULL, 0 } > }; > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi David, Thanks for the review. On 2016/12/14 19:54, David Sterba wrote: > On Wed, Dec 07, 2016 at 04:55:15PM +0900, Tsutomu Itoh wrote: >> The 'qgroup show' command does not synchronize filesystem. >> Therefore, 'qgroup show' may not display the correct value unless >> synchronized with 'filesystem sync' command etc. >> >> So add the '--sync' and '--no-sync' options so that we can choose >> whether or not to synchronize when executing the command. >> >> Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> >> --- >> v2: use getopt_long with enum instead of single letter (suggested by Qu) >> --- >> Documentation/btrfs-qgroup.asciidoc | 6 ++++++ >> cmds-qgroup.c | 33 +++++++++++++++++++++++++++++---- >> 2 files changed, 35 insertions(+), 4 deletions(-) >> >> diff --git a/Documentation/btrfs-qgroup.asciidoc b/Documentation/btrfs-qgroup.asciidoc >> index 438dbc7..9c65795 100644 >> --- a/Documentation/btrfs-qgroup.asciidoc >> +++ b/Documentation/btrfs-qgroup.asciidoc >> @@ -126,6 +126,12 @@ Prefix \'+' means ascending order and \'-' means descending order of <attr>. >> If no prefix is given, use ascending order by default. >> + >> If multiple <attr>s is given, use comma to separate. >> ++ >> +--sync:::: >> +To retrieve information after updating the status of qgroups, >> +invoke sync before getting information. > > This could be more specific, that it's a filesystem sync. > >> +--no-sync:::: >> +Do not invoke sync before getting information (default). > > I'm not sure we need this option, how is it supposed to be used? I made it to pair with --sync, but there is no use case in particular. So, I would like to drop this with the next patch. > >> @@ -311,8 +313,15 @@ static int cmd_qgroup_show(int argc, char **argv) >> >> while (1) { >> int c; >> + enum { >> + GETOPT_VAL_SORT = 256, >> + GETOPT_VAL_SYNC, >> + GETOPT_VAL_NO_SYNC >> + }; >> static const struct option long_options[] = { >> - {"sort", required_argument, NULL, 'S'}, >> + {"sort", required_argument, NULL, GETOPT_VAL_SORT}, > > This change is unrelated to the patch, please make a separate patch for > that. OK. I'll separate this with the next patch. Thanks, Tsutomu > > Otherwise looks good. > >> + {"sync", no_argument, NULL, GETOPT_VAL_SYNC}, >> + {"no-sync", no_argument, NULL, GETOPT_VAL_NO_SYNC}, >> { NULL, 0, NULL, 0 } >> }; >> -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/btrfs-qgroup.asciidoc b/Documentation/btrfs-qgroup.asciidoc index 438dbc7..9c65795 100644 --- a/Documentation/btrfs-qgroup.asciidoc +++ b/Documentation/btrfs-qgroup.asciidoc @@ -126,6 +126,12 @@ Prefix \'+' means ascending order and \'-' means descending order of <attr>. If no prefix is given, use ascending order by default. + If multiple <attr>s is given, use comma to separate. ++ +--sync:::: +To retrieve information after updating the status of qgroups, +invoke sync before getting information. +--no-sync:::: +Do not invoke sync before getting information (default). EXIT STATUS ----------- diff --git a/cmds-qgroup.c b/cmds-qgroup.c index bc15077..b494f6f 100644 --- a/cmds-qgroup.c +++ b/cmds-qgroup.c @@ -272,8 +272,7 @@ static int cmd_qgroup_destroy(int argc, char **argv) } static const char * const cmd_qgroup_show_usage[] = { - "btrfs qgroup show -pcreFf " - "[--sort=qgroupid,rfer,excl,max_rfer,max_excl] <path>", + "btrfs qgroup show [options] <path>", "Show subvolume quota groups.", "-p print parent qgroup id", "-c print child qgroup id", @@ -288,6 +287,8 @@ static const char * const cmd_qgroup_show_usage[] = { " list qgroups sorted by specified items", " you can use '+' or '-' in front of each item.", " (+:ascending, -:descending, ascending default)", + "--sync invoke sync before getting info", + "--no-sync do not invoke sync before getting info (default)", NULL }; @@ -301,6 +302,7 @@ static int cmd_qgroup_show(int argc, char **argv) u64 qgroupid; int filter_flag = 0; unsigned unit_mode; + int sync = 0; struct btrfs_qgroup_comparer_set *comparer_set; struct btrfs_qgroup_filter_set *filter_set; @@ -311,8 +313,15 @@ static int cmd_qgroup_show(int argc, char **argv) while (1) { int c; + enum { + GETOPT_VAL_SORT = 256, + GETOPT_VAL_SYNC, + GETOPT_VAL_NO_SYNC + }; static const struct option long_options[] = { - {"sort", required_argument, NULL, 'S'}, + {"sort", required_argument, NULL, GETOPT_VAL_SORT}, + {"sync", no_argument, NULL, GETOPT_VAL_SYNC}, + {"no-sync", no_argument, NULL, GETOPT_VAL_NO_SYNC}, { NULL, 0, NULL, 0 } }; @@ -342,12 +351,18 @@ static int cmd_qgroup_show(int argc, char **argv) case 'f': filter_flag |= 0x2; break; - case 'S': + case GETOPT_VAL_SORT: ret = btrfs_qgroup_parse_sort_string(optarg, &comparer_set); if (ret) usage(cmd_qgroup_show_usage); break; + case GETOPT_VAL_SYNC: + sync = 1; + break; + case GETOPT_VAL_NO_SYNC: + sync = 0; + break; default: usage(cmd_qgroup_show_usage); } @@ -365,6 +380,16 @@ static int cmd_qgroup_show(int argc, char **argv) return 1; } + if (sync) { + ret = ioctl(fd, BTRFS_IOC_SYNC); + if (ret < 0) { + error("sync ioctl failed on '%s': %s", path, + strerror(errno)); + close_file_or_dir(fd, dirstream); + goto out; + } + } + if (filter_flag) { ret = lookup_path_rootid(fd, &qgroupid); if (ret < 0) {
The 'qgroup show' command does not synchronize filesystem. Therefore, 'qgroup show' may not display the correct value unless synchronized with 'filesystem sync' command etc. So add the '--sync' and '--no-sync' options so that we can choose whether or not to synchronize when executing the command. Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> --- v2: use getopt_long with enum instead of single letter (suggested by Qu) --- Documentation/btrfs-qgroup.asciidoc | 6 ++++++ cmds-qgroup.c | 33 +++++++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-)