diff options
| author | Alex Elder <elder@inktank.com> | 2013-02-20 05:20:56 +0400 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2013-02-20 05:21:08 +0400 |
| commit | 4c7a08c83a7842e88838dde16684d6bafffdfaf0 (patch) | |
| tree | c5fe0057b2ff9f98a64ceb6fa076e75da8225cdd /include/linux/ceph/ceph_features.h | |
| parent | 19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff) | |
| parent | 903bb32e890237ca43ab847e561e5377cfe0fdb3 (diff) | |
| download | linux-4c7a08c83a7842e88838dde16684d6bafffdfaf0.tar.xz | |
Merge branch 'testing' of github.com:ceph/ceph-client into into linux-3.8-ceph
Diffstat (limited to 'include/linux/ceph/ceph_features.h')
| -rw-r--r-- | include/linux/ceph/ceph_features.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h index dad579b0c0e6..2160aab482f6 100644 --- a/include/linux/ceph/ceph_features.h +++ b/include/linux/ceph/ceph_features.h @@ -14,13 +14,19 @@ #define CEPH_FEATURE_DIRLAYOUTHASH (1<<7) /* bits 8-17 defined by user-space; not supported yet here */ #define CEPH_FEATURE_CRUSH_TUNABLES (1<<18) +/* bits 19-24 defined by user-space; not supported yet here */ +#define CEPH_FEATURE_CRUSH_TUNABLES2 (1<<25) +/* bit 26 defined by user-space; not supported yet here */ +#define CEPH_FEATURE_REPLY_CREATE_INODE (1<<27) /* * Features supported. */ #define CEPH_FEATURES_SUPPORTED_DEFAULT \ (CEPH_FEATURE_NOSRCADDR | \ - CEPH_FEATURE_CRUSH_TUNABLES) + CEPH_FEATURE_CRUSH_TUNABLES | \ + CEPH_FEATURE_CRUSH_TUNABLES2 | \ + CEPH_FEATURE_REPLY_CREATE_INODE) #define CEPH_FEATURES_REQUIRED_DEFAULT \ (CEPH_FEATURE_NOSRCADDR) |