TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceph: extract entity name from device id

Browse Source 
Previously, the "name" in the new device syntax "<name>@<fsid>.<fsname>"
was ignored because (presumably) tests were done using mount.ceph which
also passed the entity name using "-o name=foo". If mounting is done
without the mount.ceph helper, the new device id syntax fails to set
the name properly.

Cc: stable@vger.kernel.org
Link: https://tracker.ceph.com/issues/68516
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Patrick Donnelly
2024-10-12 20:54:11 -04:00
committed by Ilya Dryomov
parent 6779c9d59a
commit 955710afcb
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/ceph/super.c
+9 -1
View File
@@ -285,7 +285,9 @@ static int ceph_parse_new_source(const char *dev_name, const char *dev_name_end,
size_t len; size_t len;
struct ceph_fsid fsid; struct ceph_fsid fsid;
struct ceph_parse_opts_ctx *pctx = fc->fs_private; struct ceph_parse_opts_ctx *pctx = fc->fs_private;
struct ceph_options *opts = pctx->copts;
struct ceph_mount_options *fsopt = pctx->opts; struct ceph_mount_options *fsopt = pctx->opts;
const char *name_start = dev_name;
char *fsid_start, *fs_name_start; char *fsid_start, *fs_name_start;
if (*dev_name_end != '=') { if (*dev_name_end != '=') {
@@ -296,8 +298,14 @@ static int ceph_parse_new_source(const char *dev_name, const char *dev_name_end,
fsid_start = strchr(dev_name, '@'); fsid_start = strchr(dev_name, '@');
if (!fsid_start) if (!fsid_start)
return invalfc(fc, "missing cluster fsid"); return invalfc(fc, "missing cluster fsid");
++fsid_start; /* start of cluster fsid */ len = fsid_start - name_start;
kfree(opts->name);
opts->name = kstrndup(name_start, len, GFP_KERNEL);
if (!opts->name)
return -ENOMEM;
dout("using %s entity name", opts->name);
++fsid_start; /* start of cluster fsid */
fs_name_start = strchr(fsid_start, '.'); fs_name_start = strchr(fsid_start, '.');
if (!fs_name_start) if (!fs_name_start)
return invalfc(fc, "missing file system name"); return invalfc(fc, "missing file system name");