staging: lustre: coding style fixes found by checkpatch.pl

The patch removes "WARNING: Prefer using '"%s...", __func__'
to using 'xxxxxxxx', this function's name, in a string" warnings
reported by checkpatch.pl script.

Signed-off-by: Simo Koskinen <koskisoft@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 0520f02f670d997a24d8d1f05ea7d3b42c59f177..64763aacda57d5dd0134e00b9fceceb4c5888c14 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -2936,7 +2936,7 @@ failed:
 net_failed:
        kiblnd_shutdown(ni);
 
-       CDEBUG(D_NET, "kiblnd_startup failed\n");
+       CDEBUG(D_NET, "%s failed\n", __func__);
        return -ENETDOWN;
 }
 

diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c
index d886504bc6ccf7856e2127ccd29fd0041321a0a6..bc0779c02d9721ae8966790c5508e51f4f9eb4a2 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/lib-move.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-move.c
@@ -2034,7 +2034,7 @@ LNetPut(lnet_nid_t self, struct lnet_handle_md mdh, enum lnet_ack_req ack,
                return -ENOENT;
        }
 
-       CDEBUG(D_NET, "LNetPut -> %s\n", libcfs_id2str(target));
+       CDEBUG(D_NET, "%s -> %s\n", __func__, libcfs_id2str(target));
 
        lnet_msg_attach_md(msg, md, 0, 0);
 
@@ -2239,7 +2239,7 @@ LNetGet(lnet_nid_t self, struct lnet_handle_md mdh,
                return -ENOENT;
        }
 
-       CDEBUG(D_NET, "LNetGet -> %s\n", libcfs_id2str(target));
+       CDEBUG(D_NET, "%s -> %s\n", __func__, libcfs_id2str(target));
 
        lnet_msg_attach_md(msg, md, 0, 0);
 

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
index 39433ac9fd571e2076849a69e554c26dcfe9e3b9..d571b8b050d88ee16a6f8e9e5a36ec1bb4e6e01d 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
@@ -90,8 +90,8 @@ ldlm_flocks_overlap(struct ldlm_lock *lock, struct ldlm_lock *new)
 static inline void
 ldlm_flock_destroy(struct ldlm_lock *lock, enum ldlm_mode mode, __u64 flags)
 {
-       LDLM_DEBUG(lock, "ldlm_flock_destroy(mode: %d, flags: 0x%llx)",
-                  mode, flags);
+       LDLM_DEBUG(lock, "%s(mode: %d, flags: 0x%llx)",
+                  __func__, mode, flags);
 
        /* Safe to not lock here, since it should be empty anyway */
        LASSERT(hlist_unhashed(&lock->l_exp_flock_hash));

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
index 895d07d07177a0642dc64e83c60fe029f907e238..e2707336586c4d362276c69685656fed6a0a3933 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
@@ -1138,7 +1138,7 @@ int ldlm_init(void)
 void ldlm_exit(void)
 {
        if (ldlm_refcount)
-               CERROR("ldlm_refcount is %d in ldlm_exit!\n", ldlm_refcount);
+               CERROR("ldlm_refcount is %d in %s!\n", ldlm_refcount, __func__);
        kmem_cache_destroy(ldlm_resource_slab);
        /* ldlm_lock_put() use RCU to call ldlm_lock_free, so need call
         * synchronize_rcu() to wait a grace period elapsed, so that

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
index d96a3048bddc9f78e7a8228b96e22e3bda43c2bc..f3bf238d074853bd93fd2082ca3e5ce2a0719f2b 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
@@ -1663,7 +1663,7 @@ int ldlm_cli_cancel_list(struct list_head *cancels, int count,
 
                if (res < 0) {
                        CDEBUG_LIMIT(res == -ESHUTDOWN ? D_DLMTRACE : D_ERROR,
-                                    "ldlm_cli_cancel_list: %d\n", res);
+                                    "%s: %d\n", __func__, res);
                        res = count;
                }
 

diff --git a/drivers/staging/lustre/lustre/lov/lov_lock.c b/drivers/staging/lustre/lustre/lov/lov_lock.c
index 7d0d3ea5a92a8a403322002896f9a5dc6af65fc4..e12dc5afc14fd2e950540e51bb5ea0ea67a1b440 100644 (file)
--- a/drivers/staging/lustre/lustre/lov/lov_lock.c
+++ b/drivers/staging/lustre/lustre/lov/lov_lock.c
@@ -264,8 +264,8 @@ static void lov_lock_cancel(const struct lu_env *env,
                        cl_lock_cancel(subenv->lse_env, sublock);
                } else {
                        CL_LOCK_DEBUG(D_ERROR, env, slice->cls_lock,
-                                     "lov_lock_cancel fails with %ld.\n",
-                                     PTR_ERR(subenv));
+                                     "%s fails with %ld.\n",
+                                     __func__, PTR_ERR(subenv));
                }
        }
 }

diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c
index 304e9875abfb36315ee5a0a16756c16bb4d0d253..09c98184a29163c874aa640be48decd99aa1e0d4 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c
@@ -1409,9 +1409,9 @@ void lu_context_key_degister(struct lu_context_key *key)
         */
        while (atomic_read(&key->lct_used) > 1) {
                spin_unlock(&lu_keys_guard);
-               CDEBUG(D_INFO, "lu_context_key_degister: \"%s\" %p, %d\n",
-                      key->lct_owner ? key->lct_owner->name : "", key,
-                      atomic_read(&key->lct_used));
+               CDEBUG(D_INFO, "%s: \"%s\" %p, %d\n",
+                      __func__, key->lct_owner ? key->lct_owner->name : "",
+                      key, atomic_read(&key->lct_used));
                schedule();
                spin_lock(&lu_keys_guard);
        }
@@ -1548,7 +1548,8 @@ void lu_context_key_quiesce(struct lu_context_key *key)
                 */
                while (atomic_read(&lu_key_initing_cnt) > 0) {
                        spin_unlock(&lu_keys_guard);
-                       CDEBUG(D_INFO, "lu_context_key_quiesce: \"%s\" %p, %d (%d)\n",
+                       CDEBUG(D_INFO, "%s: \"%s\" %p, %d (%d)\n",
+                              __func__,
                               key->lct_owner ? key->lct_owner->name : "",
                               key, atomic_read(&key->lct_used),
                        atomic_read(&lu_key_initing_cnt));