Get rid of FIXME comment. Uuids from dmesg are now the same as uuids
given by btrfs-progs.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---
fs/btrfs/volumes.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 2636a05..83b789c 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -714,12 +714,8 @@ int btrfs_scan_one_device(const char *path, fmode_t flags,
void *holder,
transid = btrfs_super_generation(disk_super);
if (disk_super->label[0])
printk(KERN_INFO "device label %s ", disk_super->label);
- else {
- /* FIXME, make a readl uuid parser */
- printk(KERN_INFO "device fsid %llx-%llx ",
- *(unsigned long long *)disk_super->fsid,
- *(unsigned long long *)(disk_super->fsid + 8));
- }
+ else
+ printk(KERN_INFO "device fsid %pU ", disk_super->fsid);
printk(KERN_CONT "devid %llu transid %llu %s\n",
(unsigned long long)devid, (unsigned long long)transid, path);
ret = device_list_add(path, disk_super, devid, fs_devices_ret);
--
1.7.2.3
--
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
On Wed, Feb 9, 2011 at 8:05 AM, Ilya Dryomov <idryomov@gmail.com> wrote:> Get rid of FIXME comment. Uuids from dmesg are now the same as uuids > given by btrfs-progs. > > Signed-off-by: Ilya Dryomov <idryomov@gmail.com> > --- > fs/btrfs/volumes.c | 8 ++------ > 1 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > index 2636a05..83b789c 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -714,12 +714,8 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, > transid = btrfs_super_generation(disk_super); > if (disk_super->label[0]) > printk(KERN_INFO "device label %s ", disk_super->label); > - else { > - /* FIXME, make a readl uuid parser */ > - printk(KERN_INFO "device fsid %llx-%llx ", > - *(unsigned long long *)disk_super->fsid, > - *(unsigned long long *)(disk_super->fsid + 8)); > - } > + else > + printk(KERN_INFO "device fsid %pU ", disk_super->fsid); > printk(KERN_CONT "devid %llu transid %llu %s\n", > (unsigned long long)devid, (unsigned long long)transid, path); > ret = device_list_add(path, disk_super, devid, fs_devices_ret); > -- > 1.7.2.3 >I''ve had this patch in my testing stack for a while now, and it''s been working well. The fsid now matches the UUID. It would be nice if the text string lead off with "Btrfs:" or "btrfs:". This would be similar to the way other drivers send log messages, and would make it easier to pick out the Btrfs mount message from all the other messages. -- 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
On Thu, Mar 31, 2011 at 12:14:14PM -0500, Mitch Harder wrote:> On Wed, Feb 9, 2011 at 8:05 AM, Ilya Dryomov <idryomov@gmail.com> wrote: > > Get rid of FIXME comment. Uuids from dmesg are now the same as uuids > > given by btrfs-progs. > > > > Signed-off-by: Ilya Dryomov <idryomov@gmail.com> > > --- > > fs/btrfs/volumes.c | 8 ++------ > > 1 files changed, 2 insertions(+), 6 deletions(-) > > > > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > > index 2636a05..83b789c 100644 > > --- a/fs/btrfs/volumes.c > > +++ b/fs/btrfs/volumes.c > > @@ -714,12 +714,8 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, > > transid = btrfs_super_generation(disk_super); > > if (disk_super->label[0]) > > printk(KERN_INFO "device label %s ", disk_super->label); > > - else { > > - /* FIXME, make a readl uuid parser */ > > - printk(KERN_INFO "device fsid %llx-%llx ", > > - *(unsigned long long *)disk_super->fsid, > > - *(unsigned long long *)(disk_super->fsid + 8)); > > - } > > + else > > + printk(KERN_INFO "device fsid %pU ", disk_super->fsid); > > printk(KERN_CONT "devid %llu transid %llu %s\n", > > (unsigned long long)devid, (unsigned long long)transid, path); > > ret = device_list_add(path, disk_super, devid, fs_devices_ret); > > -- > > 1.7.2.3 > > > > I''ve had this patch in my testing stack for a while now, and it''s been > working well. The fsid now matches the UUID.Chris for some reason didn''t add it to the pull request, probably because it''s minor.> It would be nice if the text string lead off with "Btrfs:" or > "btrfs:". This would be similar to the way other drivers send log > messages, and would make it easier to pick out the Btrfs mount message > from all the other messages.Currently there is a mix: some of the messages are printed with "btrfs:", others with "btrfs", most of the messages informing about abnormal conditions are printed w/o any prefix. I can resend this one with "btrfs:" prefix, but I think some kind of decision needed, so this whole thing can be fixed in one commit. Thanks, Ilya -- 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 Chris, Can you pull this into the next -rc ? It''s minor, but people think it''s useful. I just had another person asking about this patch. Thanks, Ilya -- 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