From: Yan Jun <yan.jun8@zte.com.cn>
Date: Tue, 18 Jul 2017 06:24:18 +0000 (+0800)
Subject: osd: combine conditional statement
X-Git-Tag: ses5-milestone9~1^2~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16391%2Fhead;p=ceph.git

osd: combine conditional statement

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 5b979c8c9f48..778edab3e7c7 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2280,10 +2280,10 @@ int OSD::enable_disable_fuse(bool stop)
     delete fuse_store;
     fuse_store = NULL;
     r = ::rmdir(mntpath.c_str());
-    if (r < 0)
-      r = -errno;
     if (r < 0) {
-      derr << __func__ << " failed to rmdir " << mntpath << dendl;
+      r = -errno;
+      derr << __func__ << " failed to rmdir " << mntpath << ": "
+           << cpp_strerror(r) << dendl;
       return r;
     }
     return 0;