diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-06 11:31:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-06 11:31:13 -0800 |
| commit | 21b27a74ec0f4e52e001912c89570a49494705a2 (patch) | |
| tree | c9f1bc13a14ad1bd41739e12b92d9510d5b6e6e5 /include | |
| parent | Merge tag 'upstream-4.5-rc7' of git://git.infradead.org/linux-ubifs (diff) | |
| parent | ceph: initial CEPH_FEATURE_FS_FILE_LAYOUT_V2 support (diff) | |
| download | linux-dev-21b27a74ec0f4e52e001912c89570a49494705a2.tar.xz linux-dev-21b27a74ec0f4e52e001912c89570a49494705a2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph fix from Sage Weil:
"This is a final commit we missed to align the protocol compatibility
with the feature bits.
It decodes a few extra fields in two different messages and reports
EIO when they are used (not yet supported)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: initial CEPH_FEATURE_FS_FILE_LAYOUT_V2 support
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ceph/ceph_features.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h index c1ef6f14e7be..15151f3c4120 100644 --- a/include/linux/ceph/ceph_features.h +++ b/include/linux/ceph/ceph_features.h @@ -75,6 +75,7 @@ #define CEPH_FEATURE_CRUSH_TUNABLES5 (1ULL<<58) /* chooseleaf stable mode */ // duplicated since it was introduced at the same time as CEPH_FEATURE_CRUSH_TUNABLES5 #define CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING (1ULL<<58) /* New, v7 encoding */ +#define CEPH_FEATURE_FS_FILE_LAYOUT_V2 (1ULL<<58) /* file_layout_t */ /* * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature |