From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Wed, 23 Mar 2011 17:41:36 +0000 (-0700)
Subject: MDCache: update assert to account for being a slave.
X-Git-Tag: v0.27~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08bd2ef111a3ed6366714c915e25b7b4176931ad;p=ceph.git

MDCache: update assert to account for being a slave.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index bae2a70ae8dfd..51b4b483feb1f 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1898,7 +1898,7 @@ void MDCache::predirty_journal_parents(Mutation *mut, EMetaBlob *blob,
       // because we are about to write into the dirfrag fnode and that needs
       // to commit before the lock can cycle.
      if (linkunlink) {
-       assert(parent->inode->nestlock.get_num_wrlocks());
+       assert(parent->inode->nestlock.get_num_wrlocks() || mut->is_slave());
      }
 
       if (mut->wrlocks.count(&parent->inode->nestlock) == 0) {