diff options
| author | Sage Weil <sage@inktank.com> | 2013-04-22 11:41:02 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-04-22 11:41:27 -0700 |
| commit | 568101fa72e29ee960fcf3d704f04edfd50bd072 (patch) | |
| tree | 5206d8bdbb3c231c17ffc8e07c88c7542c4400d6 | |
| parent | 8db9d0a274b5031d0fa1a3f9ec025a321b2463f6 (diff) | |
| download | ceph-568101fa72e29ee960fcf3d704f04edfd50bd072.tar.gz | |
rbd: avoid clobbering return value with udevadm settle
Fixes: #4707
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/rbd.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rbd.cc b/src/rbd.cc index 7290c19df3d..39785225284 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -1712,7 +1712,7 @@ static int do_kernel_add(const char *poolname, const char *imgname, // let udevadm do its job before we return if (udevadm_settle) { - r = system("/sbin/udevadm settle"); + int r = system("/sbin/udevadm settle"); if (r) { if (r < 0) cerr << "rbd: error executing udevadm as shell command!" << std::endl; @@ -1921,7 +1921,7 @@ static int do_kernel_rm(const char *dev) // let udevadm do its job *before* we try to unmap if (udevadm_settle) { - r = system("/sbin/udevadm settle"); + int r = system("/sbin/udevadm settle"); if (r) { if (r < 0) cerr << "rbd: error executing udevadm as shell command!" << std::endl; @@ -1948,7 +1948,7 @@ static int do_kernel_rm(const char *dev) // let udevadm finish, if present if (udevadm_settle){ - r = system("/sbin/udevadm settle"); + int r = system("/sbin/udevadm settle"); if (r) { if (r < 0) cerr << "rbd: error executing udevadm as shell command!" << std::endl; |