]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: fix regression in cciss devices names
authorLoic Dachary <ldachary@redhat.com>
Tue, 5 Jan 2016 16:42:11 +0000 (17:42 +0100)
committerLoic Dachary <ldachary@redhat.com>
Thu, 7 Jan 2016 14:21:24 +0000 (15:21 +0100)
commit22881b1686dc040d8af01c66f59a935065bb680a
treeda2b6949bfe06fbfc4c5a8ec073d0127888d0c54
parent9dc5e6cbf85681d0fb9ab249c571672456eb6556
ceph-disk: fix regression in cciss devices names

The cciss driver has device paths such as /dev/cciss/c0d1 with a
matching /sys/block/cciss!c0d1. The general case is that whenever a
device name is found in /sys/block, the / is replaced by the !.

When refactoring the ceph-disk list subcommand, this conversion was
overlooked in a few places. All explicit concatenation of /dev with a
device name are replaced with a call to get_dev_name which does the same
but also converts all ! in /.

http://tracker.ceph.com/issues/13970 Fixes: #13970

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit a2fd3a535e66b3a2b694cda9c6add33383ccfa4a)

Conflicts:
src/ceph-disk : trivial resolution
src/ceph-disk