From: Sage Weil <sage@newdream.net>
Date: Thu, 25 Mar 2010 17:58:21 +0000 (-0700)
Subject: mds: drop obsolete hack for base inodes
X-Git-Tag: v0.20~174
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52a908312ef9c1a63e80d806bc7d14cb7e1b1bf1;p=ceph.git

mds: drop obsolete hack for base inodes

We used to skip base inodes for scatter_writebehind.  But we can
journal these just like anything else, and it potentially breaks
try_to_expire if a base inode's lock is dirty, because the
completion queued on WAIT_STABLE by scatter_nudge never gets
completed.
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index e90af84c5d5e..31d4b71a6dc9 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -2813,15 +2813,6 @@ void Locker::scatter_writebehind(ScatterLock *lock)
   CInode *in = (CInode*)lock->get_parent();
   dout(10) << "scatter_writebehind " << in->inode.mtime << " on " << *lock << " on " << *in << dendl;
 
-  // hack:
-  if (in->is_base()) {
-    dout(10) << "scatter_writebehind just clearing updated flag for base inode " << *in << dendl;
-    lock->clear_dirty();
-    if (!lock->is_stable())
-      eval_gather(lock);
-    return;
-  }
-
   // journal
   Mutation *mut = new Mutation;
   mut->ls = mds->mdlog->get_current_segment();