diff options
Diffstat (limited to 'net/ceph/ceph_common.c')
-rw-r--r-- | net/ceph/ceph_common.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index 1675021d8c12..58fbfe134f93 100644 --- a/net/ceph/ceph_common.c +++ b/net/ceph/ceph_common.c | |||
@@ -293,17 +293,20 @@ static int get_secret(struct ceph_crypto_key *dst, const char *name) { | |||
293 | key_err = PTR_ERR(ukey); | 293 | key_err = PTR_ERR(ukey); |
294 | switch (key_err) { | 294 | switch (key_err) { |
295 | case -ENOKEY: | 295 | case -ENOKEY: |
296 | pr_warning("ceph: Mount failed due to key not found: %s\n", name); | 296 | pr_warn("ceph: Mount failed due to key not found: %s\n", |
297 | name); | ||
297 | break; | 298 | break; |
298 | case -EKEYEXPIRED: | 299 | case -EKEYEXPIRED: |
299 | pr_warning("ceph: Mount failed due to expired key: %s\n", name); | 300 | pr_warn("ceph: Mount failed due to expired key: %s\n", |
301 | name); | ||
300 | break; | 302 | break; |
301 | case -EKEYREVOKED: | 303 | case -EKEYREVOKED: |
302 | pr_warning("ceph: Mount failed due to revoked key: %s\n", name); | 304 | pr_warn("ceph: Mount failed due to revoked key: %s\n", |
305 | name); | ||
303 | break; | 306 | break; |
304 | default: | 307 | default: |
305 | pr_warning("ceph: Mount failed due to unknown key error" | 308 | pr_warn("ceph: Mount failed due to unknown key error %d: %s\n", |
306 | " %d: %s\n", key_err, name); | 309 | key_err, name); |
307 | } | 310 | } |
308 | err = -EPERM; | 311 | err = -EPERM; |
309 | goto out; | 312 | goto out; |
@@ -433,7 +436,7 @@ ceph_parse_options(char *options, const char *dev_name, | |||
433 | 436 | ||
434 | /* misc */ | 437 | /* misc */ |
435 | case Opt_osdtimeout: | 438 | case Opt_osdtimeout: |
436 | pr_warning("ignoring deprecated osdtimeout option\n"); | 439 | pr_warn("ignoring deprecated osdtimeout option\n"); |
437 | break; | 440 | break; |
438 | case Opt_osdkeepalivetimeout: | 441 | case Opt_osdkeepalivetimeout: |
439 | opt->osd_keepalive_timeout = intval; | 442 | opt->osd_keepalive_timeout = intval; |