>From the issue diagnosable point of view, log if the device path is changed.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
 V2: Accepts David's review comment and adds a new ret value 2
     for device_list_add() and based on that the caller function
     would indicate if the path is overwritten (thanks David).

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

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 36108e9..76133e0 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -585,6 +585,7 @@ void btrfs_free_stale_device(struct btrfs_device *cur_dev)
  *
  * Returns:
  * 1   - first time device is seen
+ * 2   - device already known but now is overwritten with new path
  * 0   - device already known
  * < 0 - error
  */
@@ -684,6 +685,7 @@ static noinline int device_list_add(const char *path,
                        fs_devices->missing_devices--;
                        device->missing = 0;
                }
+               ret = 2;
        }
 
        /*
@@ -1080,8 +1082,9 @@ 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) {
-               printk(KERN_INFO "BTRFS: device fsid %pU devid %llu transid 
%llu %s\n",
-                                               disk_super->fsid, devid, 
transid, path);
+               printk(KERN_INFO "BTRFS: device fsid %pU devid %llu transid 
%llu %s %s\n",
+                                               disk_super->fsid, devid, 
transid, path,
+                                               ret == 2 ? "(overwritten)":"");
                ret = 0;
        }
        if (!ret && fs_devices_ret)
-- 
2.7.0

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