Commit c80c98f0 authored by Al Viro's avatar Al Viro

ceph_parse_param(), ceph_parse_mon_ips(): switch to passing fc_log

... and now errorf() et.al. are never called with NULL fs_context,
so we can get rid of conditional in those.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 7f5d3814
...@@ -250,7 +250,7 @@ static int ceph_parse_source(struct fs_parameter *param, struct fs_context *fc) ...@@ -250,7 +250,7 @@ static int ceph_parse_source(struct fs_parameter *param, struct fs_context *fc)
dout("server path '%s'\n", fsopt->server_path); dout("server path '%s'\n", fsopt->server_path);
ret = ceph_parse_mon_ips(param->string, dev_name_end - dev_name, ret = ceph_parse_mon_ips(param->string, dev_name_end - dev_name,
pctx->copts, fc); pctx->copts, fc->log);
if (ret) if (ret)
return ret; return ret;
...@@ -268,7 +268,7 @@ static int ceph_parse_mount_param(struct fs_context *fc, ...@@ -268,7 +268,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
unsigned int mode; unsigned int mode;
int token, ret; int token, ret;
ret = ceph_parse_param(param, pctx->copts, fc); ret = ceph_parse_param(param, pctx->copts, fc->log);
if (ret != -ENOPARAM) if (ret != -ENOPARAM)
return ret; return ret;
......
...@@ -281,11 +281,12 @@ extern int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid); ...@@ -281,11 +281,12 @@ 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);
struct fs_parameter; struct fs_parameter;
struct fc_log;
struct ceph_options *ceph_alloc_options(void); struct ceph_options *ceph_alloc_options(void);
int ceph_parse_mon_ips(const char *buf, size_t len, struct ceph_options *opt, int ceph_parse_mon_ips(const char *buf, size_t len, struct ceph_options *opt,
struct fs_context *fc); struct fc_log *l);
int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt, int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt,
struct fs_context *fc); struct fc_log *l);
int ceph_print_client_options(struct seq_file *m, struct ceph_client *client, int ceph_print_client_options(struct seq_file *m, struct ceph_client *client,
bool show_all); bool show_all);
extern void ceph_destroy_options(struct ceph_options *opt); extern void ceph_destroy_options(struct ceph_options *opt);
......
...@@ -383,9 +383,9 @@ static int get_secret(struct ceph_crypto_key *dst, const char *name, ...@@ -383,9 +383,9 @@ static int get_secret(struct ceph_crypto_key *dst, const char *name,
} }
int ceph_parse_mon_ips(const char *buf, size_t len, struct ceph_options *opt, int ceph_parse_mon_ips(const char *buf, size_t len, struct ceph_options *opt,
struct fs_context *fc) struct fc_log *l)
{ {
struct p_log log = {.prefix = "libceph", .log = fc ? fc->log : NULL}; struct p_log log = {.prefix = "libceph", .log = l};
int ret; int ret;
/* ip1[:port1][,ip2[:port2]...] */ /* ip1[:port1][,ip2[:port2]...] */
...@@ -401,11 +401,11 @@ int ceph_parse_mon_ips(const char *buf, size_t len, struct ceph_options *opt, ...@@ -401,11 +401,11 @@ int ceph_parse_mon_ips(const char *buf, size_t len, struct ceph_options *opt,
EXPORT_SYMBOL(ceph_parse_mon_ips); EXPORT_SYMBOL(ceph_parse_mon_ips);
int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt, int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt,
struct fs_context *fc) struct fc_log *l)
{ {
struct fs_parse_result result; struct fs_parse_result result;
int token, err; int token, err;
struct p_log log = {.prefix = "libceph", .log = fc ? fc->log : NULL}; struct p_log log = {.prefix = "libceph", .log = l};
token = __fs_parse(&log, &ceph_parameters, param, &result); token = __fs_parse(&log, &ceph_parameters, param, &result);
dout("%s fs_parse '%s' token %d\n", __func__, param->key, token); dout("%s fs_parse '%s' token %d\n", __func__, param->key, token);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment