From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Fri, 27 Apr 2018 21:51:56 +0000 (+0200)
Subject: client/Client.cc: reduce scope of variable 'r'
X-Git-Tag: v13.1.0~44^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc43a88021765efc81bad8ce4fc72d5c2c71cdb4;p=ceph.git

client/Client.cc: reduce scope of variable 'r'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 131b65e61af9..50ae38c73a65 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -12364,7 +12364,6 @@ int Client::ll_link(Inode *in, Inode *newparent, const char *newname,
   tout(cct) << vnewparent << std::endl;
   tout(cct) << newname << std::endl;
 
-  int r = 0;
   InodeRef target;
 
   auto fuse_default_permissions = cct->_conf->get_val<bool>(
@@ -12373,7 +12372,7 @@ int Client::ll_link(Inode *in, Inode *newparent, const char *newname,
     if (S_ISDIR(in->mode))
       return -EPERM;
 
-    r = may_hardlink(in, perm);
+    int r = may_hardlink(in, perm);
     if (r < 0)
       return r;