Merge tag 'ceph-for-5.9-rc3' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Aug 2020 17:33:04 +0000 (10:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Aug 2020 17:33:04 +0000 (10:33 -0700)
Pull ceph fixes from Ilya Dryomov:
 "We have an inode number handling change, prompted by s390x which is a
  64-bit architecture with a 32-bit ino_t, a patch to disallow leases to
  avoid potential data integrity issues when CephFS is re-exported via
  NFS or CIFS and a fix for the bulk of W=1 compilation warnings"

* tag 'ceph-for-5.9-rc3' of git://github.com/ceph/ceph-client:
  ceph: don't allow setlease on cephfs
  ceph: fix inode number handling on arches with 32-bit ino_t
  libceph: add __maybe_unused to DEFINE_CEPH_FEATURE

1  2 
fs/ceph/dir.c
fs/ceph/file.c

diff --cc fs/ceph/dir.c
Simple merge
diff --cc fs/ceph/file.c
Simple merge