From: Nathan Scott <nathans@sgi.com>
Date: Mon, 26 Jun 2006 06:09:02 +0000 (+0000)
Subject: Merge a bug fix from Bastian Kleineidam, related to correctly transalating device... 
X-Git-Tag: v2.9.0~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=462bd3f79b49c8cf7f8b86323b27e0a14ad4efb9;p=thirdparty%2Fxfsprogs-dev.git

Merge a bug fix from Bastian Kleineidam, related to correctly transalating device names to filesystem paths for reporting.
Merge of master-melb:xfs-cmds:26348a by kenmcd.
---

diff --git a/libxcmd/paths.c b/libxcmd/paths.c
index 70383e051..b84720a8c 100644
--- 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;