Merge branch 'file_layouts' into unstable

Conflicts:
	src/mds/CInode.cc
	src/mds/CInode.h
	src/mds/MDCache.cc
	src/mds/SimpleLock.h

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

diff --cc src/mds/CInode.h
index c3ede95b9c6d5148599d40b1adf19424bc48b773,413bcf734cb921bf0589585f65517854af833877..c3f9c821ac21721cc2379d8a51040098f4fa57de
--- 1/src/mds/CInode.h
--- 2/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@@ -413,7 -453,7 +466,8 @@@ private
      snaplock(this, &snaplock_type),
      nestlock(this, &nestlock_type),
      flocklock(this, &flocklock_type),
+     policylock(this, &policylock_type),
 +    scatter_pins(0),
      loner_cap(-1), want_loner_cap(-1)
    {
      g_num_ino++;
@@@ -597,9 -664,8 +678,10 @@@ public
    SimpleLock snaplock;
    ScatterLock nestlock;
    SimpleLock flocklock;
+   SimpleLock policylock;
  
 +  int scatter_pins;
 +
    SimpleLock* get_lock(int type) {
      switch (type) {
      case CEPH_LOCK_IFILE: return &filelock;

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

diff --cc src/mds/Locker.h
Simple merge

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

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

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

diff --cc src/mds/SimpleLock.h
Simple merge