RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-31 07:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gh/infernalis'

Browse Source
This commit is contained in:
Sage Weil 2015-09-08 11:02:54 -04:00
commit c979130755
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ceph-disk
View File

@ -609,7 +609,8 @@ def is_partition(dev):
return is_partition_mpath(dev)
dev = os.path.realpath(dev)
if not stat.S_ISBLK(os.lstat(dev).st_mode):
st = os.lstat(dev)
if not stat.S_ISBLK(st.st_mode):
raise Error('not a block device', dev)
name = get_dev_name(dev)
@ -617,9 +618,10 @@ def is_partition(dev):
return False
# make sure it is a partition of something else
for basename in os.listdir('/sys/block'):
if os.path.exists(os.path.join('/sys/block', basename, name)):
return True
major = os.major(st.st_rdev)
minor = os.minor(st.st_rdev)
if os.path.exists('/sys/dev/block/%d:%d/partition' % (major, minor)):
return True
raise Error('not a disk or partition', dev)