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>

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index b53278c9fd9718509e96d91d3ea1027581714214..65a30e817dd80ab9c7264ade89b9cae563998465 100644 (file)
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -694,7 +694,7 @@ static int ceph_writepages_start(struct address_space *mapping,
             (wbc->sync_mode == WB_SYNC_ALL ? "ALL" : "HOLD"));
 
        if (fsc->mount_state == CEPH_MOUNT_SHUTDOWN) {
-               pr_warning("writepage_start %p on forced umount\n", inode);
+               pr_warn("writepage_start %p on forced umount\n", inode);
                return -EIO; /* we're in a forced umount, don't write! */
        }
        if (fsc->mount_options->wsize && fsc->mount_options->wsize < wsize)

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 233c6f96910abc78d2b120e4e30a44ba0009b88a..e4fff9ff1c27c890c939c8836afe1d60504d6ab7 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -821,7 +821,7 @@ no_change:
                        spin_unlock(&ci->i_ceph_lock);
                }
        } else if (cap_fmode >= 0) {
-               pr_warning("mds issued no caps on %llx.%llx\n",
+               pr_warn("mds issued no caps on %llx.%llx\n",
                           ceph_vinop(inode));
                __ceph_get_fmode(ci, cap_fmode);
        }

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 2b4d093d056319424369f01321c710f2c9d27185..9a33b98cb0000df58714bbc842db7a80b9999099 100644 (file)
--- 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)
        /* dup? */
        if ((req->r_got_unsafe && !head->safe) ||
            (req->r_got_safe && head->safe)) {
-               pr_warning("got a dup %s reply on %llu from mds%d\n",
+               pr_warn("got a dup %s reply on %llu from mds%d\n",
                           head->safe ? "safe" : "unsafe", tid, mds);
                mutex_unlock(&mdsc->mutex);
                goto out;
        }
        if (req->r_got_safe && !head->safe) {
-               pr_warning("got unsafe after safe on %llu from mds%d\n",
+               pr_warn("got unsafe after safe on %llu from mds%d\n",
                           tid, mds);
                mutex_unlock(&mdsc->mutex);
                goto out;
@@ -3525,7 +3525,7 @@ static void peer_reset(struct ceph_connection *con)
        struct ceph_mds_session *s = con->private;
        struct ceph_mds_client *mdsc = s->s_mdsc;
 
-       pr_warning("mds%d closed our session\n", s->s_mds);
+       pr_warn("mds%d closed our session\n", s->s_mds);
        send_mds_reconnect(mdsc, s);
 }
 

diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c
index 132b64eeecd494b01d224d1d58394db498ed70a9..261531e55e9d0f9af3707f937d6efe7cfe612cf6 100644 (file)
--- a/fs/ceph/mdsmap.c
+++ b/fs/ceph/mdsmap.c
@@ -62,7 +62,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
 
        ceph_decode_16_safe(p, end, version, bad);
        if (version > 3) {
-               pr_warning("got mdsmap version %d > 3, failing", version);
+               pr_warn("got mdsmap version %d > 3, failing", version);
                goto bad;
        }