diff mbox

[v4,2/3] btrfs-progs: fs show should handle if subvol(s) mounted

Message ID 1384514735-24761-2-git-send-email-anand.jain@oracle.com (mailing list archive)
State Under Review, archived
Headers show

Commit Message

Anand Jain Nov. 15, 2013, 11:25 a.m. UTC 
as of now with out this patch user would see
fsinfo per btrfs mount path but which mean multiple
entry if more than one subvol is mounted of the same
fsid. so this patch will handle that nicely.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---

v4: rebase on integration-20131114
v3: accepts Josef suggested
v2: accepts Zach suggested

 cmds-filesystem.c |   90 +++++++++++++++++++++++++++++++++--------------------
 utils.c           |   60 +++++++++++++++++++++++++++++++++++
 utils.h           |    1 +
 3 files changed, 117 insertions(+), 34 deletions(-)

Comments

David Sterba Nov. 20, 2013, 2:18 p.m. UTC | #1 
On Fri, Nov 15, 2013 at 07:25:34PM +0800, Anand Jain wrote:
>  static int btrfs_scan_kernel(void *search)
>  {
> -	int ret = 0, fd;
> -	FILE *f;
> -	struct mntent *mnt;
> -	struct btrfs_ioctl_fs_info_args fs_info_arg;
> -	struct btrfs_ioctl_dev_info_args *dev_info_arg = NULL;
> -	struct btrfs_ioctl_space_args *space_info_arg;
> +	int ret = 0;
>  	char label[BTRFS_LABEL_SIZE];
> -
> -	f = setmntent("/proc/self/mounts", "r");
> -	if (f == NULL)
> -		return 1;
> -
> -	memset(label, 0, sizeof(label));
> -	while ((mnt = getmntent(f)) != NULL) {
> -		if (strcmp(mnt->mnt_type, "btrfs"))
> +	char mnt[BTRFS_PATH_NAME_MAX + 1];
> +	struct btrfs_ioctl_fslist *fslist;
> +	struct btrfs_ioctl_fslist *fslist_saved;

    [CC]     cmds-send.o
cmds-filesystem.c: In function ‘btrfs_scan_kernel’:
cmds-filesystem.c:461:29: warning: variable ‘fslist_saved’ set but not used [-Wunused-but-set-variable]

> +	u64 cnt_fs;
> +	int cnt_mnt;
> +	__u8 *fsid;
> +	__u64 flags;
> +
> +	ret = get_fslist(&fslist, &cnt_fs);
> +	if (ret)
> +		return ret;
> +	fslist_saved = fslist;
> +	while (cnt_fs--) {
> +		fsid = fslist->fsid;
> +		flags = fslist->flags;
> +		fslist++;
> +		if (!(flags & BTRFS_FS_MOUNTED))
>  			continue;
> -		ret = get_fs_info(mnt->mnt_dir, &fs_info_arg,
> -				&dev_info_arg);
> +		memset(mnt, 0, BTRFS_PATH_NAME_MAX + 1);
> +		memset(label, 0, sizeof(label));
> +		ret = fsid_to_mntpt(fsid, mnt, &cnt_mnt);
>  		if (ret)
>  			return ret;
> -
> -		if (get_label_mounted(mnt->mnt_dir, label)) {
> -			kfree(dev_info_arg);
> +		if (get_label_mounted(mnt, label))
>  			return 1;
> -		}
> -		if (search && !match_search_item_kernel(fs_info_arg.fsid,
> -					mnt->mnt_dir, label, search)) {
> -			kfree(dev_info_arg);
> +
> +		if (search && !match_search_item_kernel(fsid,
> +					mnt, label, search))
>  			continue;
> -		}
>  
> -		fd = open(mnt->mnt_dir, O_RDONLY);
> -		if ((fd != -1) && !get_df(fd, &space_info_arg)) {
> -			print_one_fs(&fs_info_arg, dev_info_arg,
> -					space_info_arg, label, mnt->mnt_dir);
> -			kfree(space_info_arg);
> -			memset(label, 0, sizeof(label));
> -		}
> -		if (fd != -1)
> -			close(fd);
> -		kfree(dev_info_arg);
> +		handle_print(mnt, label);
>  		if (search)
>  			return 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
Anand Jain Nov. 21, 2013, 3:32 a.m. UTC | #2 
On 11/20/2013 10:18 PM, David Sterba wrote:
> On Fri, Nov 15, 2013 at 07:25:34PM +0800, Anand Jain wrote:
>>   static int btrfs_scan_kernel(void *search)
>>   {
>> -	int ret = 0, fd;
>> -	FILE *f;
>> -	struct mntent *mnt;
>> -	struct btrfs_ioctl_fs_info_args fs_info_arg;
>> -	struct btrfs_ioctl_dev_info_args *dev_info_arg = NULL;
>> -	struct btrfs_ioctl_space_args *space_info_arg;
>> +	int ret = 0;
>>   	char label[BTRFS_LABEL_SIZE];
>> -
>> -	f = setmntent("/proc/self/mounts", "r");
>> -	if (f == NULL)
>> -		return 1;
>> -
>> -	memset(label, 0, sizeof(label));
>> -	while ((mnt = getmntent(f)) != NULL) {
>> -		if (strcmp(mnt->mnt_type, "btrfs"))
>> +	char mnt[BTRFS_PATH_NAME_MAX + 1];
>> +	struct btrfs_ioctl_fslist *fslist;
>> +	struct btrfs_ioctl_fslist *fslist_saved;
>
>      [CC]     cmds-send.o
> cmds-filesystem.c: In function ‘btrfs_scan_kernel’:
> cmds-filesystem.c:461:29: warning: variable ‘fslist_saved’ set but not used [-Wunused-but-set-variable]

  Thanks David. That was something for later todo which I missed.
  sorry my mistake. Sent out v5.

>> +	u64 cnt_fs;
>> +	int cnt_mnt;
>> +	__u8 *fsid;
>> +	__u64 flags;
>> +
>> +	ret = get_fslist(&fslist, &cnt_fs);
>> +	if (ret)
>> +		return ret;
>> +	fslist_saved = fslist;
>> +	while (cnt_fs--) {
>> +		fsid = fslist->fsid;
>> +		flags = fslist->flags;
>> +		fslist++;
>> +		if (!(flags & BTRFS_FS_MOUNTED))
>>   			continue;
>> -		ret = get_fs_info(mnt->mnt_dir, &fs_info_arg,
>> -				&dev_info_arg);
>> +		memset(mnt, 0, BTRFS_PATH_NAME_MAX + 1);
>> +		memset(label, 0, sizeof(label));
>> +		ret = fsid_to_mntpt(fsid, mnt, &cnt_mnt);
>>   		if (ret)
>>   			return ret;
>> -
>> -		if (get_label_mounted(mnt->mnt_dir, label)) {
>> -			kfree(dev_info_arg);
>> +		if (get_label_mounted(mnt, label))
>>   			return 1;
>> -		}
>> -		if (search && !match_search_item_kernel(fs_info_arg.fsid,
>> -					mnt->mnt_dir, label, search)) {
>> -			kfree(dev_info_arg);
>> +
>> +		if (search && !match_search_item_kernel(fsid,
>> +					mnt, label, search))
>>   			continue;
>> -		}
>>
>> -		fd = open(mnt->mnt_dir, O_RDONLY);
>> -		if ((fd != -1) && !get_df(fd, &space_info_arg)) {
>> -			print_one_fs(&fs_info_arg, dev_info_arg,
>> -					space_info_arg, label, mnt->mnt_dir);
>> -			kfree(space_info_arg);
>> -			memset(label, 0, sizeof(label));
>> -		}
>> -		if (fd != -1)
>> -			close(fd);
>> -		kfree(dev_info_arg);
>> +		handle_print(mnt, label);
>>   		if (search)
>>   			return 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
>
--
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
David Sterba Nov. 22, 2013, 7:56 a.m. UTC | #3 
On Thu, Nov 21, 2013 at 11:32:36AM +0800, Anand Jain wrote:
> On 11/20/2013 10:18 PM, David Sterba wrote:
> >On Fri, Nov 15, 2013 at 07:25:34PM +0800, Anand Jain wrote:
> >>  static int btrfs_scan_kernel(void *search)
> >>  {
> >>-	int ret = 0, fd;
> >>-	FILE *f;
> >>-	struct mntent *mnt;
> >>-	struct btrfs_ioctl_fs_info_args fs_info_arg;
> >>-	struct btrfs_ioctl_dev_info_args *dev_info_arg = NULL;
> >>-	struct btrfs_ioctl_space_args *space_info_arg;
> >>+	int ret = 0;
> >>  	char label[BTRFS_LABEL_SIZE];
> >>-
> >>-	f = setmntent("/proc/self/mounts", "r");
> >>-	if (f == NULL)
> >>-		return 1;
> >>-
> >>-	memset(label, 0, sizeof(label));
> >>-	while ((mnt = getmntent(f)) != NULL) {
> >>-		if (strcmp(mnt->mnt_type, "btrfs"))
> >>+	char mnt[BTRFS_PATH_NAME_MAX + 1];
> >>+	struct btrfs_ioctl_fslist *fslist;
> >>+	struct btrfs_ioctl_fslist *fslist_saved;
> >
> >     [CC]     cmds-send.o
> >cmds-filesystem.c: In function ‘btrfs_scan_kernel’:
> >cmds-filesystem.c:461:29: warning: variable ‘fslist_saved’ set but not used [-Wunused-but-set-variable]
> 
>  Thanks David. That was something for later todo which I missed.
>  sorry my mistake. Sent out v5.

Thanks, patch replaced.
--
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 mbox

Patch

diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index c747193..b23d337 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -318,6 +318,29 @@  static int print_one_fs(struct btrfs_ioctl_fs_info_args *fs_info,
 	return 0;
 }
 
+static void handle_print(char *mnt, char *label)
+{
+	int fd;
+	struct btrfs_ioctl_fs_info_args fs_info_arg;
+	struct btrfs_ioctl_dev_info_args *dev_info_arg = NULL;
+	struct btrfs_ioctl_space_args *space_info_arg;
+
+	if (get_fs_info(mnt, &fs_info_arg, &dev_info_arg)) {
+		fprintf(stdout, "ERROR: get_fs_info failed\n");
+		return;
+	}
+
+	fd = open(mnt, O_RDONLY);
+	if (fd != -1 && !get_df(fd, &space_info_arg)) {
+		print_one_fs(&fs_info_arg, dev_info_arg,
+				space_info_arg, label, mnt);
+		kfree(space_info_arg);
+	}
+	if (fd != -1)
+		close(fd);
+	kfree(dev_info_arg);
+}
+
 /* This function checks if the given input parameter is
  * an uuid or a path
  * return -1: some error in the given input
@@ -352,47 +375,39 @@  static int check_arg_type(char *input)
 
 static int btrfs_scan_kernel(void *search)
 {
-	int ret = 0, fd;
-	FILE *f;
-	struct mntent *mnt;
-	struct btrfs_ioctl_fs_info_args fs_info_arg;
-	struct btrfs_ioctl_dev_info_args *dev_info_arg = NULL;
-	struct btrfs_ioctl_space_args *space_info_arg;
+	int ret = 0;
 	char label[BTRFS_LABEL_SIZE];
-
-	f = setmntent("/proc/self/mounts", "r");
-	if (f == NULL)
-		return 1;
-
-	memset(label, 0, sizeof(label));
-	while ((mnt = getmntent(f)) != NULL) {
-		if (strcmp(mnt->mnt_type, "btrfs"))
+	char mnt[BTRFS_PATH_NAME_MAX + 1];
+	struct btrfs_ioctl_fslist *fslist;
+	struct btrfs_ioctl_fslist *fslist_saved;
+	u64 cnt_fs;
+	int cnt_mnt;
+	__u8 *fsid;
+	__u64 flags;
+
+	ret = get_fslist(&fslist, &cnt_fs);
+	if (ret)
+		return ret;
+	fslist_saved = fslist;
+	while (cnt_fs--) {
+		fsid = fslist->fsid;
+		flags = fslist->flags;
+		fslist++;
+		if (!(flags & BTRFS_FS_MOUNTED))
 			continue;
-		ret = get_fs_info(mnt->mnt_dir, &fs_info_arg,
-				&dev_info_arg);
+		memset(mnt, 0, BTRFS_PATH_NAME_MAX + 1);
+		memset(label, 0, sizeof(label));
+		ret = fsid_to_mntpt(fsid, mnt, &cnt_mnt);
 		if (ret)
 			return ret;
-
-		if (get_label_mounted(mnt->mnt_dir, label)) {
-			kfree(dev_info_arg);
+		if (get_label_mounted(mnt, label))
 			return 1;
-		}
-		if (search && !match_search_item_kernel(fs_info_arg.fsid,
-					mnt->mnt_dir, label, search)) {
-			kfree(dev_info_arg);
+
+		if (search && !match_search_item_kernel(fsid,
+					mnt, label, search))
 			continue;
-		}
 
-		fd = open(mnt->mnt_dir, O_RDONLY);
-		if ((fd != -1) && !get_df(fd, &space_info_arg)) {
-			print_one_fs(&fs_info_arg, dev_info_arg,
-					space_info_arg, label, mnt->mnt_dir);
-			kfree(space_info_arg);
-			memset(label, 0, sizeof(label));
-		}
-		if (fd != -1)
-			close(fd);
-		kfree(dev_info_arg);
+		handle_print(mnt, label);
 		if (search)
 			return 0;
 	}
@@ -470,7 +485,14 @@  static int cmd_show(int argc, char **argv)
 				else
 					goto devs_only;
 			}
+		} else if (type == BTRFS_ARG_MNTPOINT) {
+			char label[BTRFS_LABEL_SIZE];
+			if (get_label_mounted(search, label))
+				return 1;
+			handle_print(search, label);
+			return 0;
 		}
+
 	}
 
 	if (where == BTRFS_SCAN_DEV)
diff --git a/utils.c b/utils.c
index 1ed7cde..ddbd623 100644
--- a/utils.c
+++ b/utils.c
@@ -2186,3 +2186,63 @@  out:
 	close(fd);
 	return ret;
 }
+
+/* This finds the mount point for a given fsid,
+ *  subvols of the same fs/fsid can be mounted
+ *  so here this picks and lowest subvol id
+ *  and returns the mount point
+*/
+int fsid_to_mntpt(__u8 *fsid, char *mntpt, int *mnt_cnt)
+{
+	int fd = -1, ret = 0;
+	DIR *dirstream = NULL;
+	FILE *f;
+	struct btrfs_ioctl_fs_info_args fi_args;
+	u64 svid, saved_svid = (u64)-1;
+	struct mntent *mnt;
+	int mcnt = 0;
+
+	*mnt_cnt = 0;
+	f = setmntent("/proc/self/mounts", "r");
+	if (f == NULL)
+		return 1;
+
+	while ((mnt = getmntent(f)) != NULL) {
+		if (strcmp(mnt->mnt_type, "btrfs"))
+			continue;
+		fd = open_file_or_dir(mnt->mnt_dir, &dirstream);
+		if (fd < 0) {
+			ret = -errno;
+			return ret;
+		}
+		ret = ioctl(fd, BTRFS_IOC_FS_INFO, &fi_args);
+		if (ret < 0) {
+			ret = -errno;
+			close_file_or_dir(fd, dirstream);
+			break;
+		}
+		if (uuid_compare(fsid, fi_args.fsid)) {
+			close_file_or_dir(fd, dirstream);
+			continue;
+		}
+
+		/* found */
+		mcnt++;
+		ret = btrfs_list_get_path_rootid(fd, &svid);
+		if (ret) {
+			/* error so just copy and return*/
+			strcpy(mntpt, mnt->mnt_dir);
+			close_file_or_dir(fd, dirstream);
+			break;
+		}
+		if (svid < saved_svid) {
+			strcpy(mntpt, mnt->mnt_dir);
+			saved_svid = svid;
+		}
+	}
+	endmntent(f);
+	if (mcnt)
+		*mnt_cnt = mcnt;
+
+	return ret;
+}
diff --git a/utils.h b/utils.h
index 2fc230b..00f1c18 100644
--- a/utils.h
+++ b/utils.h
@@ -97,5 +97,6 @@  int lookup_ino_rootid(int fd, u64 *rootid);
 int btrfs_scan_lblkid(int update_kernel);
 int get_btrfs_mount(const char *dev, char *mp, size_t mp_size);
 int get_fslist(struct btrfs_ioctl_fslist **out_fslist, u64 *out_count);
+int fsid_to_mntpt(__u8 *fsid, char *mntpt, int *mnt_cnt);
 
 #endif