summaryrefslogtreecommitdiff
path: root/lib/blkid/devname.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2017-08-29 08:03:31 -0400
committerTheodore Ts'o <tytso@mit.edu>2017-08-29 08:03:31 -0400
commit58a31b508e2cc520565d5de20c9087ac36923164 (patch)
tree3fda3205008b1a5cb9bc4b444194229e5bb326e5 /lib/blkid/devname.c
parenta070f28b4f11bccb8d1ffb58b758f4de5d9f642f (diff)
parent2172519d766198a587e4474eaa829578cde4f433 (diff)
downloade2fsprogs-58a31b508e2cc520565d5de20c9087ac36923164.tar.gz
Merge branch 'maint' into next
Diffstat (limited to 'lib/blkid/devname.c')
-rw-r--r--lib/blkid/devname.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
index 444afdc9..e2b80517 100644
--- a/lib/blkid/devname.c
+++ b/lib/blkid/devname.c
@@ -231,7 +231,8 @@ static void probe_one(blkid_cache cache, const char *ptname,
dev->bid_devno == devno)
goto set_pri;
- if (stat(device, &st) == 0 && S_ISBLK(st.st_mode) &&
+ if (stat(device, &st) == 0 &&
+ blkidP_is_disk_device(st.st_mode) &&
st.st_rdev == devno) {
devname = blkid_strdup(device);
goto get_dev;