I've added an upstream fix to this PR: https://github.com/ceph/ceph/pull/51071 If also addresses an omission in the diff in comment #3.