diff options
| author | Joe Perches <joe@perches.com> | 2014-09-09 21:17:29 -0700 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@redhat.com> | 2014-10-14 21:03:23 +0400 |
| commit | b9a678994b4a64b1106ab2cf7cfe7cbc10bb6f40 (patch) | |
| tree | eddb79372ab905331c38cdda791a24d793c50a86 /net/ceph/ceph_common.c | |
| parent | 5d23371fdb7dc03fa6fe054da3467efb0d347945 (diff) | |
| download | linux-stable-b9a678994b4a64b1106ab2cf7cfe7cbc10bb6f40.tar.gz linux-stable-b9a678994b4a64b1106ab2cf7cfe7cbc10bb6f40.tar.bz2 linux-stable-b9a678994b4a64b1106ab2cf7cfe7cbc10bb6f40.zip | |
libceph: Convert pr_warning to pr_warn
Use the more common pr_warn.
Other miscellanea:
o Coalesce formats
o Realign arguments
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
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) { key_err = PTR_ERR(ukey); switch (key_err) { case -ENOKEY: - pr_warning("ceph: Mount failed due to key not found: %s\n", name); + pr_warn("ceph: Mount failed due to key not found: %s\n", + name); break; case -EKEYEXPIRED: - pr_warning("ceph: Mount failed due to expired key: %s\n", name); + pr_warn("ceph: Mount failed due to expired key: %s\n", + name); break; case -EKEYREVOKED: - pr_warning("ceph: Mount failed due to revoked key: %s\n", name); + pr_warn("ceph: Mount failed due to revoked key: %s\n", + name); break; default: - pr_warning("ceph: Mount failed due to unknown key error" - " %d: %s\n", key_err, name); + pr_warn("ceph: Mount failed due to unknown key error %d: %s\n", + key_err, name); } err = -EPERM; goto out; @@ -433,7 +436,7 @@ ceph_parse_options(char *options, const char *dev_name, /* misc */ case Opt_osdtimeout: - pr_warning("ignoring deprecated osdtimeout option\n"); + pr_warn("ignoring deprecated osdtimeout option\n"); break; case Opt_osdkeepalivetimeout: opt->osd_keepalive_timeout = intval; |