Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22b63a29 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Chris Mason
Browse files

Btrfs - use %pU to print fsid 



Get rid of FIXME comment.  Uuids from dmesg are now the same as uuids
given by btrfs-progs.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 08d2f347

fs/btrfs/volumes.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -689,12 +689,8 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, 
	transid = btrfs_super_generation(disk_super);

	transid = btrfs_super_generation(disk_super);

	if (disk_super->label[0])

	if (disk_super->label[0])

		printk(KERN_INFO "device label %s ", disk_super->label);

		printk(KERN_INFO "device label %s ", disk_super->label);

	else {

	else

		/* FIXME, make a readl uuid parser */

		printk(KERN_INFO "device fsid %pU ", disk_super->fsid);

		printk(KERN_INFO "device fsid %llx-%llx ",

		       *(unsigned long long *)disk_super->fsid,

		       *(unsigned long long *)(disk_super->fsid + 8));

	}

	printk(KERN_CONT "devid %llu transid %llu %s\n",

	printk(KERN_CONT "devid %llu transid %llu %s\n",

	       (unsigned long long)devid, (unsigned long long)transid, path);

	       (unsigned long long)devid, (unsigned long long)transid, path);

	ret = device_list_add(path, disk_super, devid, fs_devices_ret);

	ret = device_list_add(path, disk_super, devid, fs_devices_ret);