Merge a bug fix from Bastian Kleineidam, related to correctly transalating device...

Merge of master-melb:xfs-cmds:26348a by kenmcd.

diff --git a/libxcmd/paths.c b/libxcmd/paths.c
index 70383e05198b22d24a4c56d16b36e58de8951938..b84720a8c607724e7ceb52d7039d0191e9d5ec25 100644 (file)
--- a/libxcmd/paths.c
+++ b/libxcmd/paths.c
@@ -50,7 +50,10 @@ fs_table_lookup(
        for (i = 0; i < fs_count; i++) {
                if ((flags & fs_table[i].fs_flags) == 0)
                        continue;
-               if (sbuf.st_dev == fs_table[i].fs_datadev)
+               if (S_ISBLK(sbuf.st_mode) || S_ISCHR(sbuf.st_mode)) {
+                       if (sbuf.st_rdev == fs_table[i].fs_datadev)
+                               return &fs_table[i];
+               } else if (sbuf.st_dev == fs_table[i].fs_datadev)
                        return &fs_table[i];
        }
        return NULL;