kclient: kill dout(0, ...) calls

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index d5e0b146a1f87a7d688a480e1c60bc14c496be9a..95130c59df03a4fba564acf43a9c62bb923d18d7 100644 (file)
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@ -169,7 +169,8 @@ static void ceph_invalidatepage(struct page *page, unsigned long offset)
         * warning, in case we end up with accounting problems later.
         */
        if (!PageDirty(page))
-               dout(0, "%p invalidatepage %p page not dirty\n", inode, page);
+               pr_err("ceph %p invalidatepage %p page not dirty\n", inode,
+                      page);
 
        if (offset == 0)
                ClearPageChecked(page);

diff --git a/src/kernel/caps.c b/src/kernel/caps.c
index 8a3af26b23b419c34bf75f108e84b467a9f80c93..7de6db79a2c912cad008f1ee8e41c90555341dc8 100644 (file)
--- a/src/kernel/caps.c
+++ b/src/kernel/caps.c
@@ -174,8 +174,8 @@ int ceph_reserve_caps(struct ceph_cap_reservation *ctx, int need)
 
 out_alloc_count:
        /* we didn't manage to reserve as much as we needed */
-       dout(0, "reserve caps ctx=%p ENOMEM need=%d got=%d\n",
-            ctx, need, have);
+       pr_warning("ceph reserve caps ctx=%p ENOMEM need=%d got=%d\n",
+                  ctx, need, have);
        return ret;
 }
 
@@ -1558,8 +1558,8 @@ void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc,
                                   cap->issued | cap->implemented,
                                   ci->i_flushing_caps);
                } else {
-                       dout(0, " %p auth cap %p not mds%d ???\n", inode, cap,
-                            session->s_mds);
+                       pr_err("ceph %p auth cap %p not mds%d ???\n", inode,
+                              cap, session->s_mds);
                        spin_unlock(&inode->i_lock);
                }
        }

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index abd3c32bdef69b90fc1f53e4cb6d42cbcbfc823f..c219230c64068306d5c34a01e60741072a0b1158 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -828,8 +828,8 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req,
         * invariants.
         */
        if (rinfo->head->op & CEPH_MDS_OP_WRITE) {
-               dout(0, "fill_trace faking empty trace on %lld %s\n",
-                    req->r_tid, ceph_mds_op_name(rinfo->head->op));
+               pr_info("ceph fill_trace faking empty trace on %lld %s\n",
+                       req->r_tid, ceph_mds_op_name(rinfo->head->op));
                if (rinfo->head->is_dentry) {
                        rinfo->head->is_dentry = 0;
                        err = fill_inode(req->r_locked_dir,
@@ -1132,7 +1132,7 @@ retry_lookup:
                if (fill_inode(in, &rinfo->dir_in[i], NULL, session,
                               req->r_request_started, -1,
                               &req->r_caps_reservation) < 0) {
-                       dout(0, "fill_inode badness on %p\n", in);
+                       pr_err("ceph fill_inode badness on %p\n", in);
                        dput(dn);
                        continue;
                }

diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index 3971c3512af0f0a6a8f503835063bbfb247f6264..28f5fddc0275510586b1f47a1ddb428cfa98d2a6 100644 (file)
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -690,8 +690,8 @@ static int wake_up_session_cb(struct inode *inode, struct ceph_cap *cap,
 
        spin_lock(&inode->i_lock);
        if (cap->gen != session->s_cap_gen) {
-               dout(0, "failed to reconnect %p cap %p (gen %d < session %d)\n",
-                    inode, cap, cap->gen, session->s_cap_gen);
+               pr_err("ceph failed reconnect %p cap %p (gen %d < sess %d)\n",
+                      inode, cap, cap->gen, session->s_cap_gen);
                __ceph_remove_cap(cap, NULL);
        }
        wake_up(&ceph_inode(inode)->i_cap_wq);
@@ -1539,8 +1539,8 @@ void ceph_mdsc_handle_reply(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
        /* dup? */
        if ((req->r_got_unsafe && !head->safe) ||
            (req->r_got_safe && head->safe)) {
-               dout(0, "got a dup %s reply on %llu from mds%d\n",
-                    head->safe ? "safe" : "unsafe", tid, mds);
+               pr_warning("ceph got a dup %s reply on %llu from mds%d\n",
+                          head->safe ? "safe" : "unsafe", tid, mds);
                mutex_unlock(&mdsc->mutex);
                goto out;
        }
@@ -2283,7 +2283,7 @@ out:
        return;
 
 bad:
-       dout(0, "corrupt lease message\n");
+       pr_err("ceph corrupt lease message\n");
 }
 
 void ceph_mdsc_lease_send_msg(struct ceph_mds_client *mdsc, int mds,

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index 9db07ca80a49898befb5c51621bcdf775bc0272b..a453a921e21a11636d954bc379f081234570e6f9 100644 (file)
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -263,7 +263,7 @@ static int ceph_tcp_listen(struct ceph_messenger *msgr)
                pr_err("ceph failed to getsockname: %d\n", ret);
                goto err;
        }
-       dout(0, "listening on %u.%u.%u.%u:%u\n", IPQUADPORT(*myaddr));
+       pr_info("ceph listening on %u.%u.%u.%u:%u\n", IPQUADPORT(*myaddr));
 
        /* we don't care too much if this works or not */
        sock->ops->listen(sock, CEPH_MSGR_BACKUP);
@@ -511,7 +511,6 @@ static void __remove_connection(struct ceph_messenger *msgr,
        unsigned long key;
        void **slot, *val;
 
-       dout(0, "__remove_connection: %p\n", con);
        dout(20, "__remove_connection %p\n", con);
        if (list_empty(&con->list_all)) {
                dout(20, "__remove_connection %p not registered\n", con);
@@ -567,7 +566,6 @@ static void __replace_connection(struct ceph_messenger *msgr,
        unsigned long key = hash_addr(&new->peer_addr);
        void **slot;
 
-       dout(0, "replace_connection %p with %p\n", old, new);
        dout(10, "replace_connection %p with %p\n", old, new);
 
        /* replace in con_tree */

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index 8144c6a3f03d92923baea16a0b1ef6cb33d4b283..750539e73c2bddf5c2f47082c21fd4ae491f5e7e 100644 (file)
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -794,7 +794,7 @@ void ceph_osdc_abort_request(struct ceph_osd_client *osdc,
 {
        struct ceph_msg *msg;
 
-       dout(0, "abort_request tid %llu, revoking %p pages\n", req->r_tid,
+       dout(10, "abort_request tid %llu, revoking %p pages\n", req->r_tid,
             req->r_request);
        /*
         * mark req aborted _before_ revoking pages, so that

diff --git a/src/kernel/super.c b/src/kernel/super.c
index 0df2e65b116019234b092e333cb7256dc8cb56fb..f0fd2c7a1fc50e880318c90cbe89e5caf65cf681 100644 (file)
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -257,7 +257,8 @@ static int handle_mount_ack(struct ceph_client *client, struct ceph_msg *msg)
        ceph_decode_32_safe(&p, end, result, bad);
        ceph_decode_32_safe(&p, end, len, bad);
        if (result) {
-               dout(0, "mount denied: %.*s (%d)\n", len, (char *)p, result);
+               pr_err("ceph mount denied: %.*s (%d)\n", len, (char *)p,
+                      result);
                return result;
        }
        p += len;
@@ -570,7 +571,8 @@ static int parse_mount_args(int flags, char *options, const char *dev_name,
                if (token < Opt_ip) {
                        ret = match_int(&argstr[0], &intval);
                        if (ret < 0) {
-                               dout(0, "bad mount arg, not int\n");
+                               pr_err("ceph bad mount option arg (not int) "
+                                      "at '%s'\n", c);
                                continue;
                        }
                        dout(30, "got token %d intval %d\n", token, intval);
@@ -1182,7 +1184,7 @@ static int __init init_ceph(void)
        int ret = 0;
 
        dout(1, "init_ceph\n");
-       dout(0, "ceph (%s)\n", STRINGIFY(CEPH_GIT_VER));
+       pr_info("ceph init (%s)\n", STRINGIFY(CEPH_GIT_VER));
 
        ret = ceph_debugfs_init();
        if (ret < 0)