tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'ceph-for-5.7-rc5' of git://github.com/ceph/ceph-client

Pull ceph fixes from Ilya Dryomov:
"Fixes for an endianness handling bug that prevented mounts on
big-endian arches, a spammy log message and a couple error paths.

Also included a MAINTAINERS update"

* tag 'ceph-for-5.7-rc5' of git://github.com/ceph/ceph-client:
ceph: demote quotarealm lookup warning to a debug message
MAINTAINERS: remove myself as ceph co-maintainer
ceph: fix double unlock in handle_cap_export()
ceph: fix special error code in ceph_try_get_caps()
ceph: fix endianness bug when handling MDS session feature bits

Linus Torvalds eb24fdd8 4334f30e

+7 -14
-6
MAINTAINERS
··· 3936 3936 CEPH COMMON CODE (LIBCEPH) 3937 3937 M: Ilya Dryomov <idryomov@gmail.com> 3938 3938 M: Jeff Layton <jlayton@kernel.org> 3939 - M: Sage Weil <sage@redhat.com> 3940 3939 L: ceph-devel@vger.kernel.org 3941 3940 S: Supported 3942 3941 W: http://ceph.com/ 3943 - T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git 3944 3942 T: git git://github.com/ceph/ceph-client.git 3945 3943 F: include/linux/ceph/ 3946 3944 F: include/linux/crush/ ··· 3946 3948 3947 3949 CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH) 3948 3950 M: Jeff Layton <jlayton@kernel.org> 3949 - M: Sage Weil <sage@redhat.com> 3950 3951 M: Ilya Dryomov <idryomov@gmail.com> 3951 3952 L: ceph-devel@vger.kernel.org 3952 3953 S: Supported 3953 3954 W: http://ceph.com/ 3954 - T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git 3955 3955 T: git git://github.com/ceph/ceph-client.git 3956 3956 F: Documentation/filesystems/ceph.rst 3957 3957 F: fs/ceph/ ··· 14094 14098 14095 14099 RADOS BLOCK DEVICE (RBD) 14096 14100 M: Ilya Dryomov <idryomov@gmail.com> 14097 - M: Sage Weil <sage@redhat.com> 14098 14101 R: Dongsheng Yang <dongsheng.yang@easystack.cn> 14099 14102 L: ceph-devel@vger.kernel.org 14100 14103 S: Supported 14101 14104 W: http://ceph.com/ 14102 - T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git 14103 14105 T: git git://github.com/ceph/ceph-client.git 14104 14106 F: Documentation/ABI/testing/sysfs-bus-rbd 14105 14107 F: drivers/block/rbd.c
+2 -1
fs/ceph/caps.c
··· 2749 2749 2750 2750 ret = try_get_cap_refs(inode, need, want, 0, flags, got); 2751 2751 /* three special error codes */ 2752 - if (ret == -EAGAIN || ret == -EFBIG || ret == -EAGAIN) 2752 + if (ret == -EAGAIN || ret == -EFBIG || ret == -ESTALE) 2753 2753 ret = 0; 2754 2754 return ret; 2755 2755 } ··· 3746 3746 WARN_ON(1); 3747 3747 tsession = NULL; 3748 3748 target = -1; 3749 + mutex_lock(&session->s_mutex); 3749 3750 } 3750 3751 goto retry; 3751 3752
+3 -5
fs/ceph/mds_client.c
··· 3251 3251 void *end = p + msg->front.iov_len; 3252 3252 struct ceph_mds_session_head *h; 3253 3253 u32 op; 3254 - u64 seq; 3255 - unsigned long features = 0; 3254 + u64 seq, features = 0; 3256 3255 int wake = 0; 3257 3256 bool blacklisted = false; 3258 3257 ··· 3270 3271 goto bad; 3271 3272 /* version >= 3, feature bits */ 3272 3273 ceph_decode_32_safe(&p, end, len, bad); 3273 - ceph_decode_need(&p, end, len, bad); 3274 - memcpy(&features, p, min_t(size_t, len, sizeof(features))); 3275 - p += len; 3274 + ceph_decode_64_safe(&p, end, features, bad); 3275 + p += len - sizeof(features); 3276 3276 } 3277 3277 3278 3278 mutex_lock(&mdsc->mutex);
+2 -2
fs/ceph/quota.c
··· 159 159 } 160 160 161 161 if (IS_ERR(in)) { 162 - pr_warn("Can't lookup inode %llx (err: %ld)\n", 163 - realm->ino, PTR_ERR(in)); 162 + dout("Can't lookup inode %llx (err: %ld)\n", 163 + realm->ino, PTR_ERR(in)); 164 164 qri->timeout = jiffies + msecs_to_jiffies(60 * 1000); /* XXX */ 165 165 } else { 166 166 qri->timeout = 0;