Merge branch 'leaks' into unstable

Conflicts:
	src/mds/Locker.cc

diff --cc src/mds/CInode.cc
Simple merge

diff --cc src/mds/Locker.cc
index 45ec6f48051bbc0d88d486a830827c90d5715437,cc25d58581dc6d4adb0a71b590774dad24dcdf4e..797f9fbb0834603331becbe10b3a7d3d31e6889e
--- 1/src/mds/Locker.cc
--- 2/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@@ -2643,24 -2647,7 +2649,25 @@@ void Locker::handle_lock(MLock *m
  // ==========================================================================
  // simple lock
  
 +void Locker::handle_reqrdlock(SimpleLock *lock)
 +{
 +  MDSCacheObject *parent = lock->get_parent();
 +  if (parent->is_auth() &&
 +      lock->is_stable() &&
 +      lock->get_state() != LOCK_SYNC &&
 +      !parent->is_frozen()) {
 +    dout(7) << "handle_reqrdlock got rdlock request on " << *lock
 +          << " on " << *parent << dendl;
 +    assert(parent->is_auth()); // replica auth pinned if they're doing this!
 +    simple_sync(lock);
 +  } else {
 +    dout(7) << "handle_reqrdlock ignoring rdlock request on " << *lock
 +          << " on " << *parent << dendl;
 +    // replica will retry.
 +  }
 +}
 +
+ /* This function DOES put the passed message before returning */
  void Locker::handle_simple_lock(SimpleLock *lock, MLock *m)
  {
    int from = m->get_asker();

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/MDS.cc
Simple merge

diff --cc src/mds/Migrator.cc
Simple merge

diff --cc src/mds/Server.cc
Simple merge