From 462bd3f79b49c8cf7f8b86323b27e0a14ad4efb9 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 26 Jun 2006 06:09:02 +0000 Subject: [PATCH] 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. --- libxcmd/paths.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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; -- 2.47.2