Commit 7a76eaf4 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

staging: lustre: use module_name() macro for debug printf

We now allow lustre to be built when CONFIG_MODULES is disabled,
but that causes a build failure:

In file included from drivers/staging/lustre/include/linux/libcfs/libcfs.h:42,
                 from drivers/staging/lustre/lustre/obdclass/lu_object.c:44:
drivers/staging/lustre/lustre/obdclass/lu_object.c: In function 'lu_context_key_degister':
drivers/staging/lustre/lustre/obdclass/lu_object.c:1410:51: error: dereferencing pointer to incomplete type 'struct module'

This particular case can be avoided by using the module_name()
macro that was designed exactly to handle printing the name of
a module in all configurations.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6761f0ac
...@@ -1407,7 +1407,7 @@ void lu_context_key_degister(struct lu_context_key *key) ...@@ -1407,7 +1407,7 @@ void lu_context_key_degister(struct lu_context_key *key)
while (atomic_read(&key->lct_used) > 1) { while (atomic_read(&key->lct_used) > 1) {
spin_unlock(&lu_keys_guard); spin_unlock(&lu_keys_guard);
CDEBUG(D_INFO, "%s: \"%s\" %p, %d\n", CDEBUG(D_INFO, "%s: \"%s\" %p, %d\n",
__func__, key->lct_owner ? key->lct_owner->name : "", __func__, module_name(key->lct_owner),
key, atomic_read(&key->lct_used)); key, atomic_read(&key->lct_used));
schedule(); schedule();
spin_lock(&lu_keys_guard); spin_lock(&lu_keys_guard);
...@@ -1547,7 +1547,7 @@ void lu_context_key_quiesce(struct lu_context_key *key) ...@@ -1547,7 +1547,7 @@ void lu_context_key_quiesce(struct lu_context_key *key)
spin_unlock(&lu_keys_guard); spin_unlock(&lu_keys_guard);
CDEBUG(D_INFO, "%s: \"%s\" %p, %d (%d)\n", CDEBUG(D_INFO, "%s: \"%s\" %p, %d (%d)\n",
__func__, __func__,
key->lct_owner ? key->lct_owner->name : "", module_name(key->lct_owner),
key, atomic_read(&key->lct_used), key, atomic_read(&key->lct_used),
atomic_read(&lu_key_initing_cnt)); atomic_read(&lu_key_initing_cnt));
schedule(); schedule();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment