From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 20 Oct 2017 13:23:35 +0000 (-0400)
Subject: ceph-volume util.disk st_mode is needed for stat()
X-Git-Tag: v12.2.2~83^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a945e7776309d39955918cec7e0c5f1895abc39b;p=ceph.git

ceph-volume util.disk st_mode is needed for stat()

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e3b5663f7968e44ec0cd6db2bfc43acdb233e314)
---

diff --git a/src/ceph-volume/ceph_volume/util/disk.py b/src/ceph-volume/ceph_volume/util/disk.py
index 6d1cf567714..da3dc93413c 100644
--- a/src/ceph-volume/ceph_volume/util/disk.py
+++ b/src/ceph-volume/ceph_volume/util/disk.py
@@ -154,7 +154,7 @@ def is_device(dev):
         return TYPE == 'disk'
 
     # fallback to stat
-    return _stat_is_device(os.lstat(dev))
+    return _stat_is_device(os.lstat(dev).st_mode)
     if stat.S_ISBLK(os.lstat(dev)):
         return True
     return False
@@ -173,7 +173,7 @@ def is_partition(dev):
 
     # fallback to stat
     stat_obj = os.stat(dev)
-    if _stat_is_device(stat_obj):
+    if _stat_is_device(stat_obj.st_mode):
         return False
 
     major = os.major(stat_obj.st_rdev)