From: Loic Dachary <loic@dachary.org>
Date: Mon, 7 Oct 2013 23:15:41 +0000 (+0200)
Subject: os: stronger assert on FileStore::lfn_open
X-Git-Tag: v0.72-rc1~90^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e21e5736b31d1df69238d1add9f35aadad058c57;p=ceph.git

os: stronger assert on FileStore::lfn_open

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 3506c4a4ccd4..20afde9a0dce 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -201,7 +201,9 @@ int FileStore::lfn_open(coll_t cid,
 			IndexedPath *path,
 			Index *index) 
 {
-  assert(get_allow_sharded_objects() || oid.shard_id == ghobject_t::NO_SHARD);
+  assert(get_allow_sharded_objects() ||
+	 ( oid.shard_id == ghobject_t::NO_SHARD &&
+	   oid.generation == ghobject_t::NO_GEN ));
   assert(outfd);
   int flags = O_RDWR;
   if (create)