8 files changed, 17 insertions, 17 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 4af3588c1a96..370866cb3d48 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -352,7 +352,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)
 
         current->flags |= PF_MEMALLOC;
         server->tsk = current;  /* save process info to wake at shutdown */
-        cFYI(1, ("Demultiplex PID: %d", current->pid));
+        cFYI(1, ("Demultiplex PID: %d", task_pid_nr(current)));
         write_lock(&GlobalSMBSeslock);
         atomic_inc(&tcpSesAllocCount);
         length = tcpSesAllocCount.counter;
diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 6438941ab1f8..4f741546f4bb 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -456,7 +456,7 @@ static int check_version(struct dlm_write_request *req)
                 printk(KERN_DEBUG "dlm: process %s (%d) version mismatch "
                        "user (%d.%d.%d) kernel (%d.%d.%d)\n",
                        current->comm,
-                       current->pid,
+                       task_pid_nr(current),
                        req->version[0],
                        req->version[1],
                        req->version[2],
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 686734ff973d..0fca82021d76 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -89,7 +89,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)
                 if (inode->i_ino || strcmp(inode->i_sb->s_id, "bdev"))
                         printk(KERN_DEBUG
                                "%s(%d): dirtied inode %lu (%s) on %s\n",
-                               current->comm, current->pid, inode->i_ino,
+                               current->comm, task_pid_nr(current), inode->i_ino,
                                name, inode->i_sb->s_id);
         }
 
diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h
index 2a49f2c51a9f..4130adabd76e 100644
--- a/fs/jffs2/debug.h
+++ b/fs/jffs2/debug.h
@@ -80,28 +80,28 @@
 #define JFFS2_ERROR(fmt, ...)                                           \
         do {                                                            \
                 printk(JFFS2_ERR_MSG_PREFIX                             \
-                        " (%d) %s: " fmt, current->pid,                 \
+                        " (%d) %s: " fmt, task_pid_nr(current),         \
                         __FUNCTION__ , ##__VA_ARGS__);                  \
         } while(0)
 
 #define JFFS2_WARNING(fmt, ...)                                         \
         do {                                                            \
                 printk(JFFS2_WARN_MSG_PREFIX                            \
-                        " (%d) %s: " fmt, current->pid,                 \
+                        " (%d) %s: " fmt, task_pid_nr(current),         \
                         __FUNCTION__ , ##__VA_ARGS__);                  \
         } while(0)
 
 #define JFFS2_NOTICE(fmt, ...)                                          \
         do {                                                            \
                 printk(JFFS2_NOTICE_MSG_PREFIX                          \
-                        " (%d) %s: " fmt, current->pid,                 \
+                        " (%d) %s: " fmt, task_pid_nr(current),         \
                         __FUNCTION__ , ##__VA_ARGS__);                  \
         } while(0)
 
 #define JFFS2_DEBUG(fmt, ...)                                           \
         do {                                                            \
                 printk(JFFS2_DBG_MSG_PREFIX                             \
-                        " (%d) %s: " fmt, current->pid,                 \
+                        " (%d) %s: " fmt, task_pid_nr(current),         \
                         __FUNCTION__ , ##__VA_ARGS__);                  \
         } while(0)
 
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 46934c97f8f7..d0199189924c 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1029,13 +1029,13 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
                 if (EX_WGATHER(exp)) {
                         if (atomic_read(&inode->i_writecount) > 1
                             || (last_ino == inode->i_ino && last_dev == inode->i_sb->s_dev)) {
-                                dprintk("nfsd: write defer %d\n", current->pid);
+                                dprintk("nfsd: write defer %d\n", task_pid_nr(current));
                                 msleep(10);
-                                dprintk("nfsd: write resume %d\n", current->pid);
+                                dprintk("nfsd: write resume %d\n", task_pid_nr(current));
                         }
 
                         if (inode->i_state & I_DIRTY) {
-                                dprintk("nfsd: write sync %d\n", current->pid);
+                                dprintk("nfsd: write sync %d\n", task_pid_nr(current));
                                 host_err=nfsd_sync(file);
                         }
 #if 0
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index f14b541fab95..9cc7c0418b70 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1372,7 +1372,7 @@ static ssize_t o2hb_region_pid_read(struct o2hb_region *reg,
 
         spin_lock(&o2hb_live_lock);
         if (reg->hr_task)
-                pid = reg->hr_task->pid;
+                pid = task_pid_nr(reg->hr_task);
         spin_unlock(&o2hb_live_lock);
 
         if (!pid)
diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h
index 75cd877f6d42..cd046060114e 100644
--- a/fs/ocfs2/cluster/masklog.h
+++ b/fs/ocfs2/cluster/masklog.h
@@ -192,7 +192,7 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits;
  * previous token if args expands to nothing.
  */
 #define __mlog_printk(level, fmt, args...)                              \
-        printk(level "(%u,%lu):%s:%d " fmt, current->pid,               \
+        printk(level "(%u,%lu):%s:%d " fmt, task_pid_nr(current),       \
                __mlog_cpu_guess, __PRETTY_FUNCTION__, __LINE__ ,        \
                ##args)
 
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index a2c33160bfd6..2fde7bf91434 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -259,7 +259,7 @@ static void dlm_print_reco_node_status(struct dlm_ctxt *dlm)
         struct dlm_lock_resource *res;
 
         mlog(ML_NOTICE, "%s(%d): recovery info, state=%s, dead=%u, master=%u\n",
-             dlm->name, dlm->dlm_reco_thread_task->pid,
+             dlm->name, task_pid_nr(dlm->dlm_reco_thread_task),
              dlm->reco.state & DLM_RECO_STATE_ACTIVE ? "ACTIVE" : "inactive",
              dlm->reco.dead_node, dlm->reco.new_master);
 
@@ -420,7 +420,7 @@ void dlm_wait_for_recovery(struct dlm_ctxt *dlm)
         if (dlm_in_recovery(dlm)) {
                 mlog(0, "%s: reco thread %d in recovery: "
                      "state=%d, master=%u, dead=%u\n",
-                     dlm->name, dlm->dlm_reco_thread_task->pid,
+                     dlm->name, task_pid_nr(dlm->dlm_reco_thread_task),
                      dlm->reco.state, dlm->reco.new_master,
                      dlm->reco.dead_node);
         }
@@ -483,7 +483,7 @@ static int dlm_do_recovery(struct dlm_ctxt *dlm)
                 return 0;
         }
         mlog(0, "%s(%d):recovery thread found node %u in the recovery map!\n",
-             dlm->name, dlm->dlm_reco_thread_task->pid,
+             dlm->name, task_pid_nr(dlm->dlm_reco_thread_task),
              dlm->reco.dead_node);
         spin_unlock(&dlm->spinlock);
 
@@ -507,7 +507,7 @@ static int dlm_do_recovery(struct dlm_ctxt *dlm)
                 mlog(0, "another node will master this recovery session.\n");
         }
         mlog(0, "dlm=%s (%d), new_master=%u, this node=%u, dead_node=%u\n",
-             dlm->name, dlm->dlm_reco_thread_task->pid, dlm->reco.new_master,
+             dlm->name, task_pid_nr(dlm->dlm_reco_thread_task), dlm->reco.new_master,
              dlm->node_num, dlm->reco.dead_node);
 
         /* it is safe to start everything back up here
@@ -520,7 +520,7 @@ static int dlm_do_recovery(struct dlm_ctxt *dlm)
 
 master_here:
         mlog(0, "(%d) mastering recovery of %s:%u here(this=%u)!\n",
-             dlm->dlm_reco_thread_task->pid,
+             task_pid_nr(dlm->dlm_reco_thread_task),
              dlm->name, dlm->reco.dead_node, dlm->node_num);
 
         status = dlm_remaster_locks(dlm, dlm->reco.dead_node);