aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilind Arun Choudhary <milindchoudhary@gmail.com>2007-04-26 08:30:29 -0400
committerDave Kleikamp <shaggy@linux.vnet.ibm.com>2007-04-26 08:30:29 -0400
commit3cbb1c8e1a4787d3dc2951b7615d7bb3788c49a0 (patch)
tree31d38692abd3ba77e5592599d465e3e8866e3f44
parent3e2221c73cba7d33fd5706f9bc4906ffaf421478 (diff)
JFS: use __set_current_state()
use __set_current_state(TASK_*) instead of current->state = TASK_* Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
-rw-r--r--fs/jfs/jfs_lock.h2
-rw-r--r--fs/jfs/jfs_logmgr.c4
-rw-r--r--fs/jfs/jfs_txnmgr.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/jfs/jfs_lock.h b/fs/jfs/jfs_lock.h
index df48ece4b7a3..ecf04882265e 100644
--- a/fs/jfs/jfs_lock.h
+++ b/fs/jfs/jfs_lock.h
@@ -45,7 +45,7 @@ do { \
45 io_schedule(); \ 45 io_schedule(); \
46 lock_cmd; \ 46 lock_cmd; \
47 } \ 47 } \
48 current->state = TASK_RUNNING; \ 48 __set_current_state(TASK_RUNNING); \
49 remove_wait_queue(&wq, &__wait); \ 49 remove_wait_queue(&wq, &__wait); \
50} while (0) 50} while (0)
51 51
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 5065baa530b6..ff7f1beec30d 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1590,7 +1590,7 @@ void jfs_flush_journal(struct jfs_log *log, int wait)
1590 set_current_state(TASK_UNINTERRUPTIBLE); 1590 set_current_state(TASK_UNINTERRUPTIBLE);
1591 LOGGC_UNLOCK(log); 1591 LOGGC_UNLOCK(log);
1592 schedule(); 1592 schedule();
1593 current->state = TASK_RUNNING; 1593 __set_current_state(TASK_RUNNING);
1594 LOGGC_LOCK(log); 1594 LOGGC_LOCK(log);
1595 remove_wait_queue(&target->gcwait, &__wait); 1595 remove_wait_queue(&target->gcwait, &__wait);
1596 } 1596 }
@@ -2361,7 +2361,7 @@ int jfsIOWait(void *arg)
2361 } else { 2361 } else {
2362 set_current_state(TASK_INTERRUPTIBLE); 2362 set_current_state(TASK_INTERRUPTIBLE);
2363 schedule(); 2363 schedule();
2364 current->state = TASK_RUNNING; 2364 __set_current_state(TASK_RUNNING);
2365 } 2365 }
2366 } while (!kthread_should_stop()); 2366 } while (!kthread_should_stop());
2367 2367
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 03893acbfda4..9b3de0aaa034 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -136,7 +136,7 @@ static inline void TXN_SLEEP_DROP_LOCK(wait_queue_head_t * event)
136 set_current_state(TASK_UNINTERRUPTIBLE); 136 set_current_state(TASK_UNINTERRUPTIBLE);
137 TXN_UNLOCK(); 137 TXN_UNLOCK();
138 io_schedule(); 138 io_schedule();
139 current->state = TASK_RUNNING; 139 __set_current_state(TASK_RUNNING);
140 remove_wait_queue(event, &wait); 140 remove_wait_queue(event, &wait);
141} 141}
142 142
@@ -2798,7 +2798,7 @@ int jfs_lazycommit(void *arg)
2798 set_current_state(TASK_INTERRUPTIBLE); 2798 set_current_state(TASK_INTERRUPTIBLE);
2799 LAZY_UNLOCK(flags); 2799 LAZY_UNLOCK(flags);
2800 schedule(); 2800 schedule();
2801 current->state = TASK_RUNNING; 2801 __set_current_state(TASK_RUNNING);
2802 remove_wait_queue(&jfs_commit_thread_wait, &wq); 2802 remove_wait_queue(&jfs_commit_thread_wait, &wq);
2803 } 2803 }
2804 } while (!kthread_should_stop()); 2804 } while (!kthread_should_stop());
@@ -2990,7 +2990,7 @@ int jfs_sync(void *arg)
2990 set_current_state(TASK_INTERRUPTIBLE); 2990 set_current_state(TASK_INTERRUPTIBLE);
2991 TXN_UNLOCK(); 2991 TXN_UNLOCK();
2992 schedule(); 2992 schedule();
2993 current->state = TASK_RUNNING; 2993 __set_current_state(TASK_RUNNING);
2994 } 2994 }
2995 } while (!kthread_should_stop()); 2995 } while (!kthread_should_stop());
2996 2996