Merge PR #65467 into main

* refs/pull/65467/head:

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>

diff --cc qa/tasks/cephfs/test_volumes.py
Simple merge

diff --cc src/pybind/mgr/volumes/fs/async_cloner.py
Simple merge

diff --cc src/pybind/mgr/volumes/fs/operations/subvolume.py
Simple merge

diff --cc src/pybind/mgr/volumes/fs/operations/template.py
Simple merge

diff --cc src/pybind/mgr/volumes/fs/operations/versions/subvolume_v2.py
Simple merge

diff --cc src/pybind/mgr/volumes/fs/volume.py
Simple merge