From: Manasvi Goyal <55101825+ManasviGoyal@users.noreply.github.com> Date: Mon, 27 Sep 2021 18:18:07 +0000 (+0530) Subject: mgr/volumes/fs: add extra blank line X-Git-Tag: v17.1.0~772^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=786c5a3309c01b066c5d6faf2e8044cff5365dfa;p=ceph.git mgr/volumes/fs: add extra blank line Fixes: https://tracker.ceph.com/issues/51391 Signed-off-by: Manasvi Goyal --- diff --git a/src/pybind/mgr/volumes/fs/operations/resolver.py b/src/pybind/mgr/volumes/fs/operations/resolver.py index a9543654e66d8..c7ae8c1a3109a 100644 --- a/src/pybind/mgr/volumes/fs/operations/resolver.py +++ b/src/pybind/mgr/volumes/fs/operations/resolver.py @@ -2,12 +2,14 @@ import os from .group import Group + def splitall(path): if path == "/": return ["/"] s = os.path.split(path) return splitall(s[0]) + [s[1]] + def resolve(vol_spec, path): parts = splitall(path) if len(parts) != 4 or os.path.join(parts[0], parts[1]) != vol_spec.subvolume_prefix: @@ -16,6 +18,7 @@ def resolve(vol_spec, path): subvolname = parts[3] return (groupname, subvolname) + def resolve_trash(vol_spec, path): parts = splitall(path) if len(parts) != 6 or os.path.join(parts[0], parts[1]) != vol_spec.subvolume_prefix or \