summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-07-28 19:47:24 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2023-07-28 19:47:24 +0200
commite62e26d3e9ab89a0d40f94b237676b7e540d6d5c (patch)
tree9c5ff43c0c6b6cb293a619fd1acc9467deb14e43 /fs
parentMerge tag '9p-fixes-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentrbd: retrieve and check lock owner twice before blocklisting (diff)
downloadlinux-e62e26d3e9ab89a0d40f94b237676b7e540d6d5c.tar.xz
linux-e62e26d3e9ab89a0d40f94b237676b7e540d6d5c.zip
Merge tag 'ceph-for-6.5-rc4' of https://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov: "A patch to reduce the potential for erroneous RBD exclusive lock blocklisting (fencing) with a couple of prerequisites and a fixup to prevent metrics from being sent to the MDS even just once after that has been disabled by the user. All marked for stable" * tag 'ceph-for-6.5-rc4' of https://github.com/ceph/ceph-client: rbd: retrieve and check lock owner twice before blocklisting rbd: harden get_lock_owner_info() a bit rbd: make get_lock_owner_info() return a single locker or NULL ceph: never send metrics if disable_send_metrics is set
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/metric.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/metric.c b/fs/ceph/metric.c
index cce78d769f55..6d3584f16f9a 100644
--- a/fs/ceph/metric.c
+++ b/fs/ceph/metric.c
@@ -216,7 +216,7 @@ static void metric_delayed_work(struct work_struct *work)
struct ceph_mds_client *mdsc =
container_of(m, struct ceph_mds_client, metric);
- if (mdsc->stopping)
+ if (mdsc->stopping || disable_send_metrics)
return;
if (!m->session || !check_session_state(m->session)) {