Re: [PATCH 4/4] btrfs-progs: lblkid wouldn't find non mapper path input

[Anand Jain]

Done.


On 11/07/13 04:20 AM, Josef Bacik wrote:

On Mon, Nov 04, 2013 at 11:45:45AM +0800, Anand Jain wrote:

A new test case when disk is unmounted and if the non mapper
disk path is given as the argument to the btrfs filesystem showarg
we still need this to work but lblkid will pull only mapper disks,
it won't match. So this will normalize the input to find btrfs
by fsid and pass it to the search.

v2: accepts Josef suggested

Signed-off-by: Anand Jainanand.j...@oracle.com
---
  cmds-filesystem.c |   59 +---
  1 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index f8e8475..f40178a 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -37,6 +37,7 @@
  #include version.h
  #include commands.h
  #include list_sort.h
+#include disk-io.h

  static const char * const filesystem_cmd_group_usage[] = {
btrfs filesystem [group]command  [args],
@@ -414,6 +415,39 @@ static int btrfs_scan_kernel(void *search)
return 0;
  }

+static int dev_to_fsid(char *dev, __u8 *fsid)
+{
+   struct btrfs_super_block *disk_super;
+   char *buf;
+   int ret;
+   int fd;
+
+   buf = malloc(4096);
+   if (!buf)
+   return -ENOMEM;
+
+   fd = open(dev, O_RDONLY);
+   if (fd  0) {
+   ret = -errno;
+   free(buf);
+   return ret;
+   }
+
+   disk_super = (struct btrfs_super_block *)buf;
+   ret = btrfs_read_dev_super(fd, disk_super,
+   BTRFS_SUPER_INFO_OFFSET);
+   if (ret)
+   goto out;
+
+   memcpy(fsid, disk_super-fsid, BTRFS_FSID_SIZE);
+   ret = 0;
+
+out:
+   close(fd);
+   free(buf);
+   return ret;
+}
+
  static const char * const cmd_show_usage[] = {
btrfs filesystem show [options] [path|uuid|device|label],
Show the structure of a filesystem,
@@ -434,6 +468,8 @@ static int cmd_show(int argc, char **argv)
int type = 0;
char mp[BTRFS_PATH_NAME_MAX + 1];
char path[PATH_MAX];
+   __u8 fsid[BTRFS_FSID_SIZE];
+   char uuid_buf[37];

while (1) {
int long_index;
@@ -466,6 +502,10 @@ static int cmd_show(int argc, char **argv)
if (strlen(search) == 0)
usage(cmd_show_usage);
type = check_arg_type(search);
+   /*needs spl handling if input arg is block dev
+*And if input arg is mount-point just print it
+*right away
+   */


Format screwup.  Thanks,

Josef
--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@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 majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 4/4] btrfs-progs: lblkid wouldn't find non mapper path input

[Josef Bacik]

On Mon, Nov 04, 2013 at 11:45:45AM +0800, Anand Jain wrote:
 A new test case when disk is unmounted and if the non mapper
 disk path is given as the argument to the btrfs filesystem show arg
 we still need this to work but lblkid will pull only mapper disks,
 it won't match. So this will normalize the input to find btrfs
 by fsid and pass it to the search.
 
 v2: accepts Josef suggested
 
 Signed-off-by: Anand Jain anand.j...@oracle.com
 ---
  cmds-filesystem.c |   59 +---
  1 files changed, 55 insertions(+), 4 deletions(-)
 
 diff --git a/cmds-filesystem.c b/cmds-filesystem.c
 index f8e8475..f40178a 100644
 --- a/cmds-filesystem.c
 +++ b/cmds-filesystem.c
 @@ -37,6 +37,7 @@
  #include version.h
  #include commands.h
  #include list_sort.h
 +#include disk-io.h
  
  static const char * const filesystem_cmd_group_usage[] = {
   btrfs filesystem [group] command [args],
 @@ -414,6 +415,39 @@ static int btrfs_scan_kernel(void *search)
   return 0;
  }
  
 +static int dev_to_fsid(char *dev, __u8 *fsid)
 +{
 + struct btrfs_super_block *disk_super;
 + char *buf;
 + int ret;
 + int fd;
 +
 + buf = malloc(4096);
 + if (!buf)
 + return -ENOMEM;
 +
 + fd = open(dev, O_RDONLY);
 + if (fd  0) {
 + ret = -errno;
 + free(buf);
 + return ret;
 + }
 +
 + disk_super = (struct btrfs_super_block *)buf;
 + ret = btrfs_read_dev_super(fd, disk_super,
 + BTRFS_SUPER_INFO_OFFSET);
 + if (ret)
 + goto out;
 +
 + memcpy(fsid, disk_super-fsid, BTRFS_FSID_SIZE);
 + ret = 0;
 +
 +out:
 + close(fd);
 + free(buf);
 + return ret;
 +}
 +
  static const char * const cmd_show_usage[] = {
   btrfs filesystem show [options] [path|uuid|device|label],
   Show the structure of a filesystem,
 @@ -434,6 +468,8 @@ static int cmd_show(int argc, char **argv)
   int type = 0;
   char mp[BTRFS_PATH_NAME_MAX + 1];
   char path[PATH_MAX];
 + __u8 fsid[BTRFS_FSID_SIZE];
 + char uuid_buf[37];
  
   while (1) {
   int long_index;
 @@ -466,6 +502,10 @@ static int cmd_show(int argc, char **argv)
   if (strlen(search) == 0)
   usage(cmd_show_usage);
   type = check_arg_type(search);
 + /*needs spl handling if input arg is block dev
 +  *And if input arg is mount-point just print it
 +  *right away
 + */

Format screwup.  Thanks,

Josef
--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html