diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-06 17:35:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:08:06 -0400 |
commit | f3ae1b97be14ff10da8f02309ba04bed2ba035bc (patch) | |
tree | 8044e6737a76291589693d0cc465b8e1515d306b /fs | |
parent | 844e4d66f4ec3b6b6d3bcfcfba3ade2b962771e2 (diff) |
fs/ceph: replace pr_warning by pr_warn
Update the last pr_warning callsites in fs branch
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Sage Weil <sage@inktank.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ceph/addr.c | 2 | ||||
-rw-r--r-- | fs/ceph/inode.c | 2 | ||||
-rw-r--r-- | fs/ceph/mds_client.c | 6 | ||||
-rw-r--r-- | fs/ceph/mdsmap.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index b53278c9fd97..65a30e817dd8 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c | |||
@@ -694,7 +694,7 @@ static int ceph_writepages_start(struct address_space *mapping, | |||
694 | (wbc->sync_mode == WB_SYNC_ALL ? "ALL" : "HOLD")); | 694 | (wbc->sync_mode == WB_SYNC_ALL ? "ALL" : "HOLD")); |
695 | 695 | ||
696 | if (fsc->mount_state == CEPH_MOUNT_SHUTDOWN) { | 696 | if (fsc->mount_state == CEPH_MOUNT_SHUTDOWN) { |
697 | pr_warning("writepage_start %p on forced umount\n", inode); | 697 | pr_warn("writepage_start %p on forced umount\n", inode); |
698 | return -EIO; /* we're in a forced umount, don't write! */ | 698 | return -EIO; /* we're in a forced umount, don't write! */ |
699 | } | 699 | } |
700 | if (fsc->mount_options->wsize && fsc->mount_options->wsize < wsize) | 700 | if (fsc->mount_options->wsize && fsc->mount_options->wsize < wsize) |
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 233c6f96910a..e4fff9ff1c27 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c | |||
@@ -821,7 +821,7 @@ no_change: | |||
821 | spin_unlock(&ci->i_ceph_lock); | 821 | spin_unlock(&ci->i_ceph_lock); |
822 | } | 822 | } |
823 | } else if (cap_fmode >= 0) { | 823 | } else if (cap_fmode >= 0) { |
824 | pr_warning("mds issued no caps on %llx.%llx\n", | 824 | pr_warn("mds issued no caps on %llx.%llx\n", |
825 | ceph_vinop(inode)); | 825 | ceph_vinop(inode)); |
826 | __ceph_get_fmode(ci, cap_fmode); | 826 | __ceph_get_fmode(ci, cap_fmode); |
827 | } | 827 | } |
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 2b4d093d0563..9a33b98cb000 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -2218,13 +2218,13 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) | |||
2218 | /* dup? */ | 2218 | /* dup? */ |
2219 | if ((req->r_got_unsafe && !head->safe) || | 2219 | if ((req->r_got_unsafe && !head->safe) || |
2220 | (req->r_got_safe && head->safe)) { | 2220 | (req->r_got_safe && head->safe)) { |
2221 | pr_warning("got a dup %s reply on %llu from mds%d\n", | 2221 | pr_warn("got a dup %s reply on %llu from mds%d\n", |
2222 | head->safe ? "safe" : "unsafe", tid, mds); | 2222 | head->safe ? "safe" : "unsafe", tid, mds); |
2223 | mutex_unlock(&mdsc->mutex); | 2223 | mutex_unlock(&mdsc->mutex); |
2224 | goto out; | 2224 | goto out; |
2225 | } | 2225 | } |
2226 | if (req->r_got_safe && !head->safe) { | 2226 | if (req->r_got_safe && !head->safe) { |
2227 | pr_warning("got unsafe after safe on %llu from mds%d\n", | 2227 | pr_warn("got unsafe after safe on %llu from mds%d\n", |
2228 | tid, mds); | 2228 | tid, mds); |
2229 | mutex_unlock(&mdsc->mutex); | 2229 | mutex_unlock(&mdsc->mutex); |
2230 | goto out; | 2230 | goto out; |
@@ -3525,7 +3525,7 @@ static void peer_reset(struct ceph_connection *con) | |||
3525 | struct ceph_mds_session *s = con->private; | 3525 | struct ceph_mds_session *s = con->private; |
3526 | struct ceph_mds_client *mdsc = s->s_mdsc; | 3526 | struct ceph_mds_client *mdsc = s->s_mdsc; |
3527 | 3527 | ||
3528 | pr_warning("mds%d closed our session\n", s->s_mds); | 3528 | pr_warn("mds%d closed our session\n", s->s_mds); |
3529 | send_mds_reconnect(mdsc, s); | 3529 | send_mds_reconnect(mdsc, s); |
3530 | } | 3530 | } |
3531 | 3531 | ||
diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c index 132b64eeecd4..261531e55e9d 100644 --- a/fs/ceph/mdsmap.c +++ b/fs/ceph/mdsmap.c | |||
@@ -62,7 +62,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) | |||
62 | 62 | ||
63 | ceph_decode_16_safe(p, end, version, bad); | 63 | ceph_decode_16_safe(p, end, version, bad); |
64 | if (version > 3) { | 64 | if (version > 3) { |
65 | pr_warning("got mdsmap version %d > 3, failing", version); | 65 | pr_warn("got mdsmap version %d > 3, failing", version); |
66 | goto bad; | 66 | goto bad; |
67 | } | 67 | } |
68 | 68 | ||