summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-12-21 00:06:01 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2020-02-07 14:48:34 -0500
commitc80c98f0dc5dc709b04254b5f30145c6ab8800a4 (patch)
tree4f48f5a96e5cd2ec8ed7a829a2fdd423bafdc7ea /net/ceph
parent7f5d38141e309bb4ba995d9726928af85a299c50 (diff)
downloadlinux-stable-c80c98f0dc5dc709b04254b5f30145c6ab8800a4.tar.gz
linux-stable-c80c98f0dc5dc709b04254b5f30145c6ab8800a4.tar.bz2
linux-stable-c80c98f0dc5dc709b04254b5f30145c6ab8800a4.zip
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: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/ceph_common.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 9f8bc962985d..d435d22999f5 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -383,9 +383,9 @@ out:
}
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;
/* ip1[:port1][,ip2[:port2]...] */
@@ -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);
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;
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);
dout("%s fs_parse '%s' token %d\n", __func__, param->key, token);