btrfs: print only if scanned device becomes part of the fs_devices

Commit Message

Anand Jain May 29, 2014, 9:18 a.m. UTC

justification:
  a deleted missing disk if reappears would end up with -EBUSY when
  it undergoes btrfs dev scan. But the sys log indicates bringing the
  disk back to the btrfs kernel was successful

Signed-off-by: Anand Jain <[e-mail]>
---
 fs/btrfs/volumes.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

Patch

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index a1cb877..275e4d1 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -911,20 +911,21 @@  int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
 	transid = btrfs_super_generation(disk_super);
 	total_devices = btrfs_super_num_devices(disk_super);
 
-	if (disk_super->label[0]) {
-		if (disk_super->label[BTRFS_LABEL_SIZE - 1])
-			disk_super->label[BTRFS_LABEL_SIZE - 1] = '\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);
-
 	ret = device_list_add(path, disk_super, devid, fs_devices_ret);
-	if (!ret && fs_devices_ret)
+	if (!ret && fs_devices_ret) {
 		(*fs_devices_ret)->total_devices = total_devices;
 
+		if (disk_super->label[0]) {
+			if (disk_super->label[BTRFS_LABEL_SIZE - 1])
+				disk_super->label[BTRFS_LABEL_SIZE - 1] = '\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);
+	}
+
+
 error_unmap:
 	kunmap(page);
 	page_cache_release(page);