Optional Label may or may not be set, or it might be set at some time
later. However while debugging to search through the kernel logs the
scripts would need the logs to be consistent, so logs search key words
shouldn't depend on the optional variables, instead fsid is better.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
v2: fix commit log

 fs/btrfs/volumes.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index dc2db98..af176d6 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -998,13 +998,8 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, 
void *holder,
 
        ret = device_list_add(path, disk_super, devid, fs_devices_ret);
        if (ret > 0) {
-               if (disk_super->label[0]) {
-                       printk(KERN_INFO "BTRFS: device label %s ", 
disk_super->label);
-               } else {
-                       printk(KERN_INFO "BTRFS: device fsid %pU ", 
disk_super->fsid);
-               }
-
-               printk(KERN_CONT "devid %llu transid %llu %s\n", devid, 
transid, path);
+               printk(KERN_INFO "BTRFS: device fsid %pU devid %llu transid 
%llu %s\n",
+                                               disk_super->fsid, devid, 
transid, path);
                ret = 0;
        }
        if (!ret && fs_devices_ret)
-- 
2.4.1

--
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

Reply via email to