LU-1346 libcfs: cleanup cfs_curproc_xxx macros

[fs/lustre-release.git] / lustre / llite / statahead.c

diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c
index d8d2187..6b69c9e 100644 (file)
--- a/lustre/llite/statahead.c
+++ b/lustre/llite/statahead.c
@@ -978,15 +978,15 @@ static int ll_agl_thread(void *arg)
         struct l_wait_info        lwi    = { 0 };
         ENTRY;
 
-        CDEBUG(D_READA, "agl thread started: [pid %d] [parent %.*s]\n",
-               cfs_curproc_pid(), parent->d_name.len, parent->d_name.name);
+       CDEBUG(D_READA, "agl thread started: [pid %d] [parent %.*s]\n",
+              current_pid(), parent->d_name.len, parent->d_name.name);
 
-        atomic_inc(&sbi->ll_agl_total);
+       atomic_inc(&sbi->ll_agl_total);
        spin_lock(&plli->lli_agl_lock);
        sai->sai_agl_valid = 1;
        thread_set_flags(thread, SVC_RUNNING);
        spin_unlock(&plli->lli_agl_lock);
-        cfs_waitq_signal(&thread->t_ctl_waitq);
+       cfs_waitq_signal(&thread->t_ctl_waitq);
 
         while (1) {
                 l_wait_event(thread->t_ctl_waitq,
@@ -1025,7 +1025,7 @@ static int ll_agl_thread(void *arg)
        cfs_waitq_signal(&thread->t_ctl_waitq);
        ll_sai_put(sai);
        CDEBUG(D_READA, "agl thread stopped: [pid %d] [parent %.*s]\n",
-              cfs_curproc_pid(), parent->d_name.len, parent->d_name.name);
+              current_pid(), parent->d_name.len, parent->d_name.name);
        RETURN(0);
 }
 
@@ -1038,7 +1038,7 @@ static void ll_start_agl(struct dentry *parent, struct ll_statahead_info *sai)
        ENTRY;
 
        CDEBUG(D_READA, "start agl thread: [pid %d] [parent %.*s]\n",
-              cfs_curproc_pid(), parent->d_name.len, parent->d_name.name);
+              current_pid(), parent->d_name.len, parent->d_name.name);
 
        plli = ll_i2info(parent->d_inode);
        task = kthread_run(ll_agl_thread, parent,
@@ -1073,13 +1073,13 @@ static int ll_statahead_thread(void *arg)
         struct l_wait_info        lwi    = { 0 };
         ENTRY;
 
-        CDEBUG(D_READA, "statahead thread started: [pid %d] [parent %.*s]\n",
-               cfs_curproc_pid(), parent->d_name.len, parent->d_name.name);
+       CDEBUG(D_READA, "statahead thread started: [pid %d] [parent %.*s]\n",
+              current_pid(), parent->d_name.len, parent->d_name.name);
 
-        if (sbi->ll_flags & LL_SBI_AGL_ENABLED)
-                ll_start_agl(parent, sai);
+       if (sbi->ll_flags & LL_SBI_AGL_ENABLED)
+               ll_start_agl(parent, sai);
 
-        atomic_inc(&sbi->ll_sa_total);
+       atomic_inc(&sbi->ll_sa_total);
        spin_lock(&plli->lli_sa_lock);
        thread_set_flags(thread, SVC_RUNNING);
        spin_unlock(&plli->lli_sa_lock);
@@ -1263,11 +1263,11 @@ out:
                spin_unlock(&plli->lli_agl_lock);
                 cfs_waitq_signal(&agl_thread->t_ctl_waitq);
 
-                CDEBUG(D_READA, "stop agl thread: [pid %d]\n",
-                       cfs_curproc_pid());
-                l_wait_event(agl_thread->t_ctl_waitq,
-                             thread_is_stopped(agl_thread),
-                             &lwi);
+               CDEBUG(D_READA, "stop agl thread: [pid %d]\n",
+                      current_pid());
+               l_wait_event(agl_thread->t_ctl_waitq,
+                            thread_is_stopped(agl_thread),
+                            &lwi);
         } else {
                 /* Set agl_thread flags anyway. */
                 thread_set_flags(&sai->sai_agl_thread, SVC_STOPPED);
@@ -1290,9 +1290,9 @@ out:
         cfs_waitq_signal(&thread->t_ctl_waitq);
         ll_sai_put(sai);
         dput(parent);
-        CDEBUG(D_READA, "statahead thread stopped: [pid %d] [parent %.*s]\n",
-               cfs_curproc_pid(), parent->d_name.len, parent->d_name.name);
-        return rc;
+       CDEBUG(D_READA, "statahead thread stopped: [pid %d] [parent %.*s]\n",
+              current_pid(), parent->d_name.len, parent->d_name.name);
+       return rc;
 }
 
 /**
@@ -1323,7 +1323,7 @@ void ll_stop_statahead(struct inode *dir, void *key)
                        cfs_waitq_signal(&thread->t_ctl_waitq);
 
                        CDEBUG(D_READA, "stop statahead thread: [pid %d]\n",
-                              cfs_curproc_pid());
+                              current_pid());
                        l_wait_event(thread->t_ctl_waitq,
                                     thread_is_stopped(thread),
                                     &lwi);
@@ -1497,13 +1497,13 @@ ll_sai_unplug(struct ll_statahead_info *sai, struct ll_sa_entry *entry)
                 sai->sai_consecutive_miss++;
                 if (sa_low_hit(sai) && thread_is_running(thread)) {
                         atomic_inc(&sbi->ll_sa_wrong);
-                        CDEBUG(D_READA, "Statahead for dir "DFID" hit "
-                               "ratio too low: hit/miss "LPU64"/"LPU64
-                               ", sent/replied "LPU64"/"LPU64", stopping "
-                               "statahead thread: pid %d\n",
-                               PFID(&lli->lli_fid), sai->sai_hit,
-                               sai->sai_miss, sai->sai_sent,
-                               sai->sai_replied, cfs_curproc_pid());
+                       CDEBUG(D_READA, "Statahead for dir "DFID" hit "
+                              "ratio too low: hit/miss "LPU64"/"LPU64
+                              ", sent/replied "LPU64"/"LPU64", stopping "
+                              "statahead thread: pid %d\n",
+                              PFID(&lli->lli_fid), sai->sai_hit,
+                              sai->sai_miss, sai->sai_sent,
+                              sai->sai_replied, current_pid());
                        spin_lock(&lli->lli_sa_lock);
                        if (!thread_is_stopped(thread))
                                thread_set_flags(thread, SVC_STOPPING);
@@ -1539,7 +1539,7 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp,
        struct ll_inode_info     *plli;
         ENTRY;
 
-        LASSERT(lli->lli_opendir_pid == cfs_curproc_pid());
+       LASSERT(lli->lli_opendir_pid == current_pid());
 
         if (sai) {
                 thread = &sai->sai_thread;
@@ -1682,8 +1682,8 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp,
                 GOTO(out, rc = -EAGAIN);
         }
 
-        CDEBUG(D_READA, "start statahead thread: [pid %d] [parent %.*s]\n",
-               cfs_curproc_pid(), parent->d_name.len, parent->d_name.name);
+       CDEBUG(D_READA, "start statahead thread: [pid %d] [parent %.*s]\n",
+              current_pid(), parent->d_name.len, parent->d_name.name);
 
         lli->lli_sai = sai;