renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 16:53:54 +08:00
Code

libceph: rename parse_fsid() to ceph_parse_fsid() and export

Browse Source 
... as it is too generic. also, use __func__ when logging
rather than hardcoding the function name.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Venky Shankar 2021-07-14 15:35:51 +05:30 committed by Ilya Dryomov
parent 2d7c86a8f9
commit 4153c7fc93
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/ceph/libceph.h
View File

@ -296,6 +296,7 @@ extern bool libceph_compatible(void *data);
extern const char *ceph_msg_type_name(int type); extern const char *ceph_msg_type_name(int type);
extern int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid); extern int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid);
extern void *ceph_kvmalloc(size_t size, gfp_t flags); extern void *ceph_kvmalloc(size_t size, gfp_t flags);
extern int ceph_parse_fsid(const char *str, struct ceph_fsid *fsid);
struct fs_parameter; struct fs_parameter;
struct fc_log; struct fc_log;

9
net/ceph/ceph_common.c
View File

@ -217,14 +217,14 @@ void *ceph_kvmalloc(size_t size, gfp_t flags)
return p; return p;
} }
static int parse_fsid(const char *str, struct ceph_fsid *fsid) int ceph_parse_fsid(const char *str, struct ceph_fsid *fsid)
{ {
int i = 0; int i = 0;
char tmp[3]; char tmp[3];
int err = -EINVAL; int err = -EINVAL;
int d; int d;
dout("parse_fsid '%s'\n", str); dout("%s '%s'\n", __func__, str);
tmp[2] = 0; tmp[2] = 0;
while (*str && i < 16) { while (*str && i < 16) {
if (ispunct(*str)) { if (ispunct(*str)) {
@ -244,9 +244,10 @@ static int parse_fsid(const char *str, struct ceph_fsid *fsid)
if (i == 16) if (i == 16)
err = 0; err = 0;
dout("parse_fsid ret %d got fsid %pU\n", err, fsid); dout("%s ret %d got fsid %pU\n", __func__, err, fsid);
return err; return err;
} }
EXPORT_SYMBOL(ceph_parse_fsid);
/* /*
* ceph options * ceph options
@ -464,7 +465,7 @@ int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt,
break; break;
case Opt_fsid: case Opt_fsid:
err = parse_fsid(param->string, &opt->fsid); err = ceph_parse_fsid(param->string, &opt->fsid);
if (err) { if (err) {
error_plog(&log, "Failed to parse fsid: %d", err); error_plog(&log, "Failed to parse fsid: %d", err);
return err; return err;