diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-30 12:02:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-30 12:02:12 -0800 |
| commit | f6e1ea19649216156576aeafa784e3b4cee45549 (patch) | |
| tree | 7a3a3b82718767553957fb28afbc7e2c693f8f1f /include | |
| parent | 139711f033f636cc78b6aaf7363252241b9698ef (diff) | |
| parent | 664f1e259a982bf213f0cd8eea7616c89546585c (diff) | |
| download | linux-stable-f6e1ea19649216156576aeafa784e3b4cee45549.tar.gz linux-stable-f6e1ea19649216156576aeafa784e3b4cee45549.tar.bz2 linux-stable-f6e1ea19649216156576aeafa784e3b4cee45549.zip | |
Merge tag 'ceph-for-5.11-rc2' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"A fix for an edge case in MClientRequest encoding and a couple of
trivial fixups for the new msgr2 support"
* tag 'ceph-for-5.11-rc2' of git://github.com/ceph/ceph-client:
libceph: add __maybe_unused to DEFINE_MSGR2_FEATURE
libceph: align session_key and con_secret to 16 bytes
libceph: fix auth_signature buffer allocation in secure mode
ceph: reencode gid_list when reconnecting
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ceph/msgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ceph/msgr.h b/include/linux/ceph/msgr.h index f5e02f6c0655..3989dcb94d3d 100644 --- a/include/linux/ceph/msgr.h +++ b/include/linux/ceph/msgr.h @@ -33,8 +33,8 @@ #define CEPH_MSGR2_INCARNATION_1 (0ull) #define DEFINE_MSGR2_FEATURE(bit, incarnation, name) \ - static const uint64_t CEPH_MSGR2_FEATURE_##name = (1ULL << bit); \ - static const uint64_t CEPH_MSGR2_FEATUREMASK_##name = \ + static const uint64_t __maybe_unused CEPH_MSGR2_FEATURE_##name = (1ULL << bit); \ + static const uint64_t __maybe_unused CEPH_MSGR2_FEATUREMASK_##name = \ (1ULL << bit | CEPH_MSGR2_INCARNATION_##incarnation); #define HAVE_MSGR2_FEATURE(x, name) \ |