Skip to content

Commit

Permalink
btrfs: include device major and minor numbers in the device scan notice
Browse files Browse the repository at this point in the history
To better debug issues surrounding device scans, include the device's
major and minor numbers in the device scan notice for btrfs.

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Anand Jain authored and David Sterba committed Mar 5, 2024
1 parent 7ec28f8 commit 0782303
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions fs/btrfs/volumes.c
Original file line number Diff line number Diff line change
Expand Up @@ -767,8 +767,9 @@ static noinline struct btrfs_device *device_list_add(const char *path,
if (same_fsid_diff_dev) {
generate_random_uuid(fs_devices->fsid);
fs_devices->temp_fsid = true;
pr_info("BTRFS: device %s using temp-fsid %pU\n",
path, fs_devices->fsid);
pr_info("BTRFS: device %s (%d:%d) using temp-fsid %pU\n",
path, MAJOR(path_devt), MINOR(path_devt),
fs_devices->fsid);
}

mutex_lock(&fs_devices->device_list_mutex);
Expand Down Expand Up @@ -797,8 +798,9 @@ static noinline struct btrfs_device *device_list_add(const char *path,

if (fs_devices->opened) {
btrfs_err(NULL,
"device %s belongs to fsid %pU, and the fs is already mounted, scanned by %s (%d)",
path, fs_devices->fsid, current->comm,
"device %s (%d:%d) belongs to fsid %pU, and the fs is already mounted, scanned by %s (%d)",
path, MAJOR(path_devt), MINOR(path_devt),
fs_devices->fsid, current->comm,
task_pid_nr(current));
mutex_unlock(&fs_devices->device_list_mutex);
return ERR_PTR(-EBUSY);
Expand All @@ -824,13 +826,15 @@ static noinline struct btrfs_device *device_list_add(const char *path,

if (disk_super->label[0])
pr_info(
"BTRFS: device label %s devid %llu transid %llu %s scanned by %s (%d)\n",
"BTRFS: device label %s devid %llu transid %llu %s (%d:%d) scanned by %s (%d)\n",
disk_super->label, devid, found_transid, path,
MAJOR(path_devt), MINOR(path_devt),
current->comm, task_pid_nr(current));
else
pr_info(
"BTRFS: device fsid %pU devid %llu transid %llu %s scanned by %s (%d)\n",
"BTRFS: device fsid %pU devid %llu transid %llu %s (%d:%d) scanned by %s (%d)\n",
disk_super->fsid, devid, found_transid, path,
MAJOR(path_devt), MINOR(path_devt),
current->comm, task_pid_nr(current));

} else if (!device->name || strcmp(device->name->str, path)) {
Expand Down Expand Up @@ -1366,7 +1370,8 @@ struct btrfs_device *btrfs_scan_one_device(const char *path, blk_mode_t flags,
else
btrfs_free_stale_devices(devt, NULL);

pr_debug("BTRFS: skip registering single non-seed device %s\n", path);
pr_debug("BTRFS: skip registering single non-seed device %s (%d:%d)\n",
path, MAJOR(devt), MINOR(devt));
device = NULL;
goto free_disk_super;
}
Expand Down

0 comments on commit 0782303

Please sign in to comment.