From: Sage Weil <sage@inktank.com>
Date: Mon, 22 Apr 2013 18:41:02 +0000 (-0700)
Subject: rbd: avoid clobbering return value with udevadm settle
X-Git-Tag: v0.61~128
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=568101fa72e29ee960fcf3d704f04edfd50bd072;p=ceph.git

rbd: avoid clobbering return value with udevadm settle

Fixes: #4707
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/rbd.cc b/src/rbd.cc
index 7290c19df3dc..397852252844 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;