From: Igor Fedotov <ifedotov@suse.com>
Date: Mon, 6 Aug 2018 16:12:54 +0000 (+0300)
Subject: os/fusestore: del redundant and sometimes improper open_collection call
X-Git-Tag: v14.0.1~614^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0ec336a8c973468b9980c19c5eb586c0da1bbf1;p=ceph.git

os/fusestore: del redundant and sometimes improper open_collection call

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
---

diff --git a/src/os/FuseStore.cc b/src/os/FuseStore.cc
index d993cd8df9cc..02ea9fdcbdfe 100644
--- a/src/os/FuseStore.cc
+++ b/src/os/FuseStore.cc
@@ -1012,12 +1012,10 @@ static int os_unlink(const char *path)
       keys.insert(key);
       t.omap_rmkeys(cid, oid, keys);
     }
-    ch = fs->store->open_collection(cid);
     break;
 
   case FN_OBJECT_ATTR_VAL:
     t.rmattr(cid, oid, key.c_str());
-    ch = fs->store->open_collection(cid);
     break;
 
   case FN_OBJECT_OMAP_HEADER:
@@ -1025,12 +1023,10 @@ static int os_unlink(const char *path)
       bufferlist empty;
       t.omap_setheader(cid, oid, empty);
     }
-    ch = fs->store->open_collection(cid);
     break;
 
   case FN_OBJECT:
     t.remove(cid, oid);
-    ch = fs->store->open_collection(cid);
     break;
 
   case FN_COLLECTION:
@@ -1043,12 +1039,10 @@ static int os_unlink(const char *path)
         return -ENOTEMPTY;
       t.remove_collection(cid);
     }
-    ch = fs->store->open_collection(coll_t::meta());
     break;
 
   case FN_OBJECT_DATA:
     t.truncate(cid, oid, 0);
-    ch = fs->store->open_collection(cid);
     break;
 
   default: