redundnat

diff --git a/net/ceph/auth_none.c b/net/ceph/auth_none.c
index 77b5519bc45f44c2f8570c78a15c3564fdd72279..e1949f4d75724f3dd1e94a64f6f4bb43e1dece68 100644 (file)
--- a/net/ceph/auth_none.c
+++ b/net/ceph/auth_none.c
@@ -53,7 +53,7 @@ static int ceph_auth_none_build_authorizer(struct ceph_auth_client *ac,
 
        ceph_encode_64_safe(&p, end, ac->global_id, e_range);
        au->buf_len = p - (void *)au->buf;
-       dout("%s built authorizer len %d\n", __func__, au->buf_len);
+       dout("built authorizer len %d\n", au->buf_len);
        return 0;
 
 e_range:

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 4c6441536d55b6323f4b9d93b5d4837cd4ec880c..aa6b987575ac1a91427af18df987c45d35dcccda 100644 (file)
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -197,7 +197,7 @@ int ceph_parse_fsid(const char *str, struct ceph_fsid *fsid)
        int err = -EINVAL;
        int d;
 
-       dout("%s '%s'\n", __func__, str);
+       dout("'%s'\n", str);
        tmp[2] = 0;
        while (*str && i < 16) {
                if (ispunct(*str)) {
@@ -217,7 +217,7 @@ int ceph_parse_fsid(const char *str, struct ceph_fsid *fsid)
 
        if (i == 16)
                err = 0;
-       dout("%s ret %d got fsid %pU\n", __func__, err, fsid);
+       dout("ret %d got fsid %pU\n", err, fsid);
        return err;
 }
 EXPORT_SYMBOL(ceph_parse_fsid);
@@ -423,7 +423,7 @@ int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt,
        struct p_log log = {.prefix = "libceph", .log = l};
 
        token = __fs_parse(&log, ceph_parameters, param, &result);
-       dout("%s fs_parse '%s' token %d\n", __func__, param->key, token);
+       dout("fs_parse '%s' token %d\n", param->key, token);
        if (token < 0)
                return token;
 

diff --git a/net/ceph/cls_lock_client.c b/net/ceph/cls_lock_client.c
index 66136a4c1ce7fe1f1f636ba3214ceb42c64b2528..02b8a9054f4813e5015181e050cf34cfd3bd7043 100644 (file)
--- a/net/ceph/cls_lock_client.c
+++ b/net/ceph/cls_lock_client.c
@@ -70,13 +70,13 @@ int ceph_cls_lock(struct ceph_osd_client *osdc,
        p += sizeof(struct ceph_timespec);
        ceph_encode_8(&p, flags);
 
-       dout("%s lock_name %s type %d cookie %s tag %s desc %s flags 0x%x\n",
-            __func__, lock_name, type, cookie, tag, desc, flags);
+       dout("lock_name %s type %d cookie %s tag %s desc %s flags 0x%x\n",
+            lock_name, type, cookie, tag, desc, flags);
        ret = ceph_osdc_call(osdc, oid, oloc, "lock", "lock",
                             CEPH_OSD_FLAG_WRITE, lock_op_page,
                             lock_op_buf_size, NULL, NULL);
 
-       dout("%s: status %d\n", __func__, ret);
+       dout("status %d\n", ret);
        __free_page(lock_op_page);
        return ret;
 }
@@ -121,12 +121,12 @@ int ceph_cls_unlock(struct ceph_osd_client *osdc,
        ceph_encode_string(&p, end, lock_name, name_len);
        ceph_encode_string(&p, end, cookie, cookie_len);
 
-       dout("%s lock_name %s cookie %s\n", __func__, lock_name, cookie);
+       dout("lock_name %s cookie %s\n", lock_name, cookie);
        ret = ceph_osdc_call(osdc, oid, oloc, "lock", "unlock",
                             CEPH_OSD_FLAG_WRITE, unlock_op_page,
                             unlock_op_buf_size, NULL, NULL);
 
-       dout("%s: status %d\n", __func__, ret);
+       dout("status %d\n", ret);
        __free_page(unlock_op_page);
        return ret;
 }
@@ -175,13 +175,13 @@ int ceph_cls_break_lock(struct ceph_osd_client *osdc,
        ceph_encode_copy(&p, locker, sizeof(*locker));
        ceph_encode_string(&p, end, cookie, cookie_len);
 
-       dout("%s lock_name %s cookie %s locker %s%llu\n", __func__, lock_name,
+       dout("lock_name %s cookie %s locker %s%llu\n", lock_name,
             cookie, ENTITY_NAME(*locker));
        ret = ceph_osdc_call(osdc, oid, oloc, "lock", "break_lock",
                             CEPH_OSD_FLAG_WRITE, break_op_page,
                             break_op_buf_size, NULL, NULL);
 
-       dout("%s: status %d\n", __func__, ret);
+       dout("status %d\n", ret);
        __free_page(break_op_page);
        return ret;
 }
@@ -226,13 +226,13 @@ int ceph_cls_set_cookie(struct ceph_osd_client *osdc,
        ceph_encode_string(&p, end, tag, tag_len);
        ceph_encode_string(&p, end, new_cookie, new_cookie_len);
 
-       dout("%s lock_name %s type %d old_cookie %s tag %s new_cookie %s\n",
-            __func__, lock_name, type, old_cookie, tag, new_cookie);
+       dout("lock_name %s type %d old_cookie %s tag %s new_cookie %s\n",
+            lock_name, type, old_cookie, tag, new_cookie);
        ret = ceph_osdc_call(osdc, oid, oloc, "lock", "set_cookie",
                             CEPH_OSD_FLAG_WRITE, cookie_op_page,
                             cookie_op_buf_size, NULL, NULL);
 
-       dout("%s: status %d\n", __func__, ret);
+       dout("status %d\n", ret);
        __free_page(cookie_op_page);
        return ret;
 }
@@ -279,9 +279,7 @@ static int decode_locker(void **p, void *end, struct ceph_locker *locker)
        len = ceph_decode_32(p);
        *p += len; /* skip description */
 
-       dout("%s %s%llu cookie %s addr %s\n", __func__,
-            ENTITY_NAME(locker->id.name), locker->id.cookie,
-            ceph_pr_addr(&locker->info.addr));
+       dout("%s%llu cookie %s addr %s\n", ENTITY_NAME(locker->id.name), locker->id.cookie, ceph_pr_addr(&locker->info.addr));
        return 0;
 }
 
@@ -367,12 +365,12 @@ int ceph_cls_lock_info(struct ceph_osd_client *osdc,
                            get_info_op_buf_size - CEPH_ENCODING_START_BLK_LEN);
        ceph_encode_string(&p, end, lock_name, name_len);
 
-       dout("%s lock_name %s\n", __func__, lock_name);
+       dout("lock_name %s\n", lock_name);
        ret = ceph_osdc_call(osdc, oid, oloc, "lock", "get_info",
                             CEPH_OSD_FLAG_READ, get_info_op_page,
                             get_info_op_buf_size, &reply_page, &reply_len);
 
-       dout("%s: status %d\n", __func__, ret);
+       dout("status %d\n", ret);
        if (ret >= 0) {
                p = page_address(reply_page);
                end = p + reply_len;