Use helpers to obtain task pid in printks

The task_struct->pid member is going to be deprecated, so start
using the helpers (task_pid_nr/task_pid_vnr/task_pid_nr_ns) in
the kernel.

The first thing to start with is the pid, printed to dmesg - in
this case we may safely use task_pid_nr(). Besides, printks produce
more (much more) than a half of all the explicit pid usage.

[akpm@linux-foundation.org: git-drm went and changed lots of stuff]
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index 479fd462eaa9..9c4b0256490b 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -60,12 +60,12 @@ static void spin_bug(spinlock_t *lock, const char *msg)
                 owner = lock->owner;
         printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
                 msg, raw_smp_processor_id(),
-                current->comm, current->pid);
+                current->comm, task_pid_nr(current));
         printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
                         ".owner_cpu: %d\n",
                 lock, lock->magic,
                 owner ? owner->comm : "<none>",
-                owner ? owner->pid : -1,
+                owner ? task_pid_nr(owner) : -1,
                 lock->owner_cpu);
         dump_stack();
 }
@@ -116,7 +116,7 @@ static void __spin_lock_debug(spinlock_t *lock)
                         printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, "
                                         "%s/%d, %p\n",
                                 raw_smp_processor_id(), current->comm,
-                                current->pid, lock);
+                                task_pid_nr(current), lock);
                         dump_stack();
 #ifdef CONFIG_SMP
                         trigger_all_cpu_backtrace();
@@ -161,7 +161,7 @@ static void rwlock_bug(rwlock_t *lock, const char *msg)
 
         printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n",
                 msg, raw_smp_processor_id(), current->comm,
-                current->pid, lock);
+                task_pid_nr(current), lock);
         dump_stack();
 }