From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 26 Feb 2013 18:31:02 +0000 (+0100)
Subject: Client.cc: reduce the scope of some variables
X-Git-Tag: v0.59~95^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ce34616590bf496bc54df4705fcd7b5e9ed3294;p=ceph.git

Client.cc: reduce the scope of some variables

Reduce the scope of some variables.

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 085130f57e1d..8e341498c618 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -949,9 +949,8 @@ Inode* Client::insert_trace(MetaRequest *request, int mds)
                           ((request->head.op == CEPH_MDS_OP_RENAME) ?
                                         request->old_dentry : NULL));
     } else {
-      Dentry *dn = NULL;
       if (diri->dir && diri->dir->dentries.count(dname)) {
-	dn = diri->dir->dentries[dname];
+	Dentry *dn = diri->dir->dentries[dname];
 	if (dn->inode)
 	  unlink(dn, false);
       }
@@ -974,9 +973,8 @@ Inode* Client::insert_trace(MetaRequest *request, int mds)
       Dir *dir = diri->open_dir();
       insert_dentry_inode(dir, dname, &dlease, in, request->sent_stamp, mds, true);
     } else {
-      Dentry *dn = NULL;
       if (diri->dir && diri->dir->dentries.count(dname)) {
-	dn = diri->dir->dentries[dname];
+	Dentry *dn = diri->dir->dentries[dname];
 	if (dn->inode)
 	  unlink(dn, false);
       }
@@ -6550,10 +6548,10 @@ int Client::ll_getxattr(vinodeno_t vino, const char *name, void *value, size_t s
 
 int Client::_listxattr(Inode *in, char *name, size_t size, int uid, int gid)
 {
-  const char file_vxattrs[] = "ceph.file.layout";
-  const char dir_vxattrs[] = "ceph.dir.layout";
   int r = _getattr(in, CEPH_STAT_CAP_XATTR, uid, gid);
   if (r == 0) {
+    const char file_vxattrs[] = "ceph.file.layout";
+    const char dir_vxattrs[] = "ceph.dir.layout";
     for (map<string,bufferptr>::iterator p = in->xattrs.begin();
 	 p != in->xattrs.end();
 	 p++)