diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-28 10:47:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-28 10:47:24 -0700 |
| commit | e62e26d3e9ab89a0d40f94b237676b7e540d6d5c (patch) | |
| tree | 9c5ff43c0c6b6cb293a619fd1acc9467deb14e43 /fs | |
| parent | 28d79b746cf46e48e5c38c6904ea5faac217da21 (diff) | |
| parent | 588159009d5b7a09c3e5904cffddbe4a4e170301 (diff) | |
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.c | 2 |
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)) { |