X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmds-qgroup.c;h=d07bb0c0ea5663085c1a13b290f9e6e2ebbca265;hb=e764625f90f947f927f78b4166a34d9d5755ef63;hp=45075a3b2e070a10f2b94974641a461ea6f8ebc3;hpb=208ba29007c1c698d84a097afe6f85646516e282;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/cmds-qgroup.c b/cmds-qgroup.c
index 45075a3..d07bb0c 100644
--- a/cmds-qgroup.c
+++ b/cmds-qgroup.c
@@ -26,6 +26,7 @@
 #include "commands.h"
 #include "qgroup.h"
 #include "utils.h"
+#include "help.h"
 
 static const char * const qgroup_cmd_group_usage[] = {
 	"btrfs qgroup <command> [options] <path>",
@@ -44,10 +45,12 @@ static int _cmd_qgroup_assign(int assign, int argc, char **argv,
 
 	if (assign) {
 		while (1) {
-			enum { GETOPT_VAL_RESCAN = 256 };
+			enum { GETOPT_VAL_RESCAN = 256, GETOPT_VAL_NO_RESCAN };
 			static const struct option long_options[] = {
 				{ "rescan", no_argument, NULL,
 					GETOPT_VAL_RESCAN },
+				{ "no-rescan", no_argument, NULL,
+					GETOPT_VAL_NO_RESCAN },
 				{ NULL, 0, NULL, 0 }
 			};
 			int c = getopt_long(argc, argv, "", long_options, NULL);
@@ -58,6 +61,9 @@ static int _cmd_qgroup_assign(int assign, int argc, char **argv,
 			case GETOPT_VAL_RESCAN:
 				rescan = 1;
 				break;
+			case GETOPT_VAL_NO_RESCAN:
+				rescan = 0;
+				break;
 			default:
 				/* Usage printed by the caller */
 				return -1;
@@ -208,7 +214,7 @@ static const char * const cmd_qgroup_assign_usage[] = {
 	"Assign SRC as the child qgroup of DST",
 	"",
 	"--rescan       schedule qutoa rescan if needed",
-	"--no-rescan    ",
+	"--no-rescan    don't schedule quota rescan",
 	NULL
 };
 
@@ -267,8 +273,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",
@@ -283,6 +288,7 @@ 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         force sync of the filesystem before getting info",
 	NULL
 };
 
@@ -291,11 +297,11 @@ static int cmd_qgroup_show(int argc, char **argv)
 	char *path;
 	int ret = 0;
 	int fd;
-	int e;
 	DIR *dirstream = NULL;
 	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;
@@ -304,11 +310,15 @@ static int cmd_qgroup_show(int argc, char **argv)
 
 	unit_mode = get_unit_mode_from_arg(&argc, argv, 0);
 
-	optind = 1;
 	while (1) {
 		int c;
+		enum {
+			GETOPT_VAL_SORT = 256,
+			GETOPT_VAL_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},
 			{ NULL, 0, NULL, 0 }
 		};
 
@@ -338,12 +348,15 @@ 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;
 		default:
 			usage(cmd_qgroup_show_usage);
 		}
@@ -356,13 +369,26 @@ static int cmd_qgroup_show(int argc, char **argv)
 	path = argv[optind];
 	fd = btrfs_open_dir(path, &dirstream, 1);
 	if (fd < 0) {
-		btrfs_qgroup_free_filter_set(filter_set);
-		btrfs_qgroup_free_comparer_set(comparer_set);
+		free(filter_set);
+		free(comparer_set);
 		return 1;
 	}
 
+	if (sync) {
+		ret = ioctl(fd, BTRFS_IOC_SYNC);
+		if (ret < 0)
+			warning("sync ioctl failed on '%s': %s", path,
+			      strerror(errno));
+	}
+
 	if (filter_flag) {
-		qgroupid = btrfs_get_path_rootid(fd);
+		ret = lookup_path_rootid(fd, &qgroupid);
+		if (ret < 0) {
+			error("cannot resolve rootid for %s: %s",
+					path, strerror(-ret));
+			close_file_or_dir(fd, dirstream);
+			goto out;
+		}
 		if (filter_flag & 0x1)
 			btrfs_qgroup_setup_filter(&filter_set,
 					BTRFS_QGROUP_FILTER_ALL_PARENT,
@@ -373,11 +399,9 @@ static int cmd_qgroup_show(int argc, char **argv)
 					qgroupid);
 	}
 	ret = btrfs_show_qgroups(fd, filter_set, comparer_set);
-	e = errno;
 	close_file_or_dir(fd, dirstream);
-	if (ret < 0)
-		error("can't list qgroups: %s", strerror(e));
 
+out:
 	return !!ret;
 }
 
@@ -403,7 +427,6 @@ static int cmd_qgroup_limit(int argc, char **argv)
 	int exclusive = 0;
 	DIR *dirstream = NULL;
 
-	optind = 1;
 	while (1) {
 		int c = getopt(argc, argv, "ce");
 		if (c < 0)