Merge branch 'wyc-quota-v2' of git://github.com/kylinstorage/ceph into wip-fs-quota

Conflicts:
	src/include/ceph_features.h

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/include/ceph_features.h
index d9594a369e3a05b6510de2acf7642d5d7d06194f,860af30fe9b038a479772607f4f93c811f1daab7..006a88adc155ba6ed2eafb373eed3f68b3c8cc3c
--- 1/src/include/ceph_features.h
--- 2/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@@ -54,11 -54,7 +54,12 @@@
  #define CEPH_FEATURE_OSD_POOLRESEND    (1ULL<<43)
  #define CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 (1ULL<<44)
  #define CEPH_FEATURE_OSD_SET_ALLOC_HINT (1ULL<<45)
 -#define CEPH_FEATURE_MDS_QUOTA      (1ULL<<46)
 +#define CEPH_FEATURE_OSD_FADVISE_FLAGS (1ULL<<46)
++#define CEPH_FEATURE_MDS_QUOTA      (1ULL<<47)
 +
 +#define CEPH_FEATURE_RESERVED2 (1ULL<<61)  /* slow down, we are almost out... */
 +#define CEPH_FEATURE_RESERVED  (1ULL<<62)  /* DO NOT USE THIS ... last bit! */
 +#define CEPH_FEATURE_RESERVED_BROKEN  (1ULL<<63)  /* DO NOT USE THIS; see below */
  
  /*
   * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature
@@@ -133,7 -129,7 +134,8 @@@ static inline unsigned long long ceph_s
         CEPH_FEATURE_OSD_POOLRESEND |  \
           CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 |   \
           CEPH_FEATURE_OSD_SET_ALLOC_HINT |   \
 +       CEPH_FEATURE_OSD_FADVISE_FLAGS | \
+        CEPH_FEATURE_MDS_QUOTA | \
         0ULL)
  
  #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL

diff --cc src/include/ceph_fs.h
Simple merge

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

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

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

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

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

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

diff --cc src/messages/Makefile.am
Simple merge

diff --cc src/msg/Message.cc
Simple merge

diff --cc src/test/encoding/types.h
Simple merge