From: Sage Weil <sage@newdream.net>
Date: Fri, 10 Sep 2010 18:01:48 +0000 (-0700)
Subject: mds: drop useless virtual-ness for finish_scatter_gather_update
X-Git-Tag: v0.22~186
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f963b50e89fdbaa0de81ce51b413a98f31bd8bd;p=ceph.git

mds: drop useless virtual-ness for finish_scatter_gather_update

If/when we do this on dentries, _then_ we can use a virtual function, and
rewrite the single user (scatter_writebehind) to generalize to non-inodes.
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index f9a460c04838..fafda5ffa5f8 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -3136,7 +3136,7 @@ void Locker::scatter_writebehind(ScatterLock *lock)
   inode_t *pi = in->project_inode();
   pi->version = in->pre_dirty();
 
-  lock->get_parent()->finish_scatter_gather_update(lock->get_type());
+  in->finish_scatter_gather_update(lock->get_type());
   lock->start_flush();
 
   EUpdate *le = new EUpdate(mds->mdlog, "scatter_writebehind");
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 0263df9942c8..b37cdadeda45 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -2025,7 +2025,6 @@ protected:
   virtual bool is_lock_waiting(int type, uint64_t mask) { assert(0); return false; }
 
   virtual void clear_dirty_scattered(int type) { assert(0); }
-  virtual void finish_scatter_gather_update(int type) { }
 
   // ---------------------------------------------
   // ordering