diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/afs/kafsasyncd.c | 2 | ||||
| -rw-r--r-- | fs/afs/kafstimod.c | 2 | ||||
| -rw-r--r-- | fs/jbd/journal.c | 4 | ||||
| -rw-r--r-- | fs/jfs/jfs_logmgr.c | 4 | ||||
| -rw-r--r-- | fs/jfs/jfs_txnmgr.c | 8 | ||||
| -rw-r--r-- | fs/lockd/clntproc.c | 2 | ||||
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_buf.c | 4 | ||||
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/fs/afs/kafsasyncd.c b/fs/afs/kafsasyncd.c index 6fc88ae8ad..7ac07d0d47 100644 --- a/fs/afs/kafsasyncd.c +++ b/fs/afs/kafsasyncd.c | |||
| @@ -116,7 +116,7 @@ static int kafsasyncd(void *arg) | |||
| 116 | remove_wait_queue(&kafsasyncd_sleepq, &myself); | 116 | remove_wait_queue(&kafsasyncd_sleepq, &myself); |
| 117 | set_current_state(TASK_RUNNING); | 117 | set_current_state(TASK_RUNNING); |
| 118 | 118 | ||
| 119 | try_to_freeze(PF_FREEZE); | 119 | try_to_freeze(); |
| 120 | 120 | ||
| 121 | /* discard pending signals */ | 121 | /* discard pending signals */ |
| 122 | afs_discard_my_signals(); | 122 | afs_discard_my_signals(); |
diff --git a/fs/afs/kafstimod.c b/fs/afs/kafstimod.c index 86e710dd05..65bc05ab81 100644 --- a/fs/afs/kafstimod.c +++ b/fs/afs/kafstimod.c | |||
| @@ -91,7 +91,7 @@ static int kafstimod(void *arg) | |||
| 91 | complete_and_exit(&kafstimod_dead, 0); | 91 | complete_and_exit(&kafstimod_dead, 0); |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | try_to_freeze(PF_FREEZE); | 94 | try_to_freeze(); |
| 95 | 95 | ||
| 96 | /* discard pending signals */ | 96 | /* discard pending signals */ |
| 97 | afs_discard_my_signals(); | 97 | afs_discard_my_signals(); |
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 1e6f2e2ad4..5e7b439495 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
| @@ -167,7 +167,7 @@ loop: | |||
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | wake_up(&journal->j_wait_done_commit); | 169 | wake_up(&journal->j_wait_done_commit); |
| 170 | if (current->flags & PF_FREEZE) { | 170 | if (freezing(current)) { |
| 171 | /* | 171 | /* |
| 172 | * The simpler the better. Flushing journal isn't a | 172 | * The simpler the better. Flushing journal isn't a |
| 173 | * good idea, because that depends on threads that may | 173 | * good idea, because that depends on threads that may |
| @@ -175,7 +175,7 @@ loop: | |||
| 175 | */ | 175 | */ |
| 176 | jbd_debug(1, "Now suspending kjournald\n"); | 176 | jbd_debug(1, "Now suspending kjournald\n"); |
| 177 | spin_unlock(&journal->j_state_lock); | 177 | spin_unlock(&journal->j_state_lock); |
| 178 | refrigerator(PF_FREEZE); | 178 | refrigerator(); |
| 179 | spin_lock(&journal->j_state_lock); | 179 | spin_lock(&journal->j_state_lock); |
| 180 | } else { | 180 | } else { |
| 181 | /* | 181 | /* |
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 7c8387ed41..79d07624bf 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c | |||
| @@ -2359,9 +2359,9 @@ int jfsIOWait(void *arg) | |||
| 2359 | lbmStartIO(bp); | 2359 | lbmStartIO(bp); |
| 2360 | spin_lock_irq(&log_redrive_lock); | 2360 | spin_lock_irq(&log_redrive_lock); |
| 2361 | } | 2361 | } |
| 2362 | if (current->flags & PF_FREEZE) { | 2362 | if (freezing(current)) { |
| 2363 | spin_unlock_irq(&log_redrive_lock); | 2363 | spin_unlock_irq(&log_redrive_lock); |
| 2364 | refrigerator(PF_FREEZE); | 2364 | refrigerator(); |
| 2365 | } else { | 2365 | } else { |
| 2366 | add_wait_queue(&jfs_IO_thread_wait, &wq); | 2366 | add_wait_queue(&jfs_IO_thread_wait, &wq); |
| 2367 | set_current_state(TASK_INTERRUPTIBLE); | 2367 | set_current_state(TASK_INTERRUPTIBLE); |
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index 8cbaaff1d5..121c981ff4 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c | |||
| @@ -2788,9 +2788,9 @@ int jfs_lazycommit(void *arg) | |||
| 2788 | /* In case a wakeup came while all threads were active */ | 2788 | /* In case a wakeup came while all threads were active */ |
| 2789 | jfs_commit_thread_waking = 0; | 2789 | jfs_commit_thread_waking = 0; |
| 2790 | 2790 | ||
| 2791 | if (current->flags & PF_FREEZE) { | 2791 | if (freezing(current)) { |
| 2792 | LAZY_UNLOCK(flags); | 2792 | LAZY_UNLOCK(flags); |
| 2793 | refrigerator(PF_FREEZE); | 2793 | refrigerator(); |
| 2794 | } else { | 2794 | } else { |
| 2795 | DECLARE_WAITQUEUE(wq, current); | 2795 | DECLARE_WAITQUEUE(wq, current); |
| 2796 | 2796 | ||
| @@ -2987,9 +2987,9 @@ int jfs_sync(void *arg) | |||
| 2987 | /* Add anon_list2 back to anon_list */ | 2987 | /* Add anon_list2 back to anon_list */ |
| 2988 | list_splice_init(&TxAnchor.anon_list2, &TxAnchor.anon_list); | 2988 | list_splice_init(&TxAnchor.anon_list2, &TxAnchor.anon_list); |
| 2989 | 2989 | ||
| 2990 | if (current->flags & PF_FREEZE) { | 2990 | if (freezing(current)) { |
| 2991 | TXN_UNLOCK(); | 2991 | TXN_UNLOCK(); |
| 2992 | refrigerator(PF_FREEZE); | 2992 | refrigerator(); |
| 2993 | } else { | 2993 | } else { |
| 2994 | DECLARE_WAITQUEUE(wq, current); | 2994 | DECLARE_WAITQUEUE(wq, current); |
| 2995 | 2995 | ||
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index fd77ed1d71..14b3ce87fa 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c | |||
| @@ -313,7 +313,7 @@ static int nlm_wait_on_grace(wait_queue_head_t *queue) | |||
| 313 | prepare_to_wait(queue, &wait, TASK_INTERRUPTIBLE); | 313 | prepare_to_wait(queue, &wait, TASK_INTERRUPTIBLE); |
| 314 | if (!signalled ()) { | 314 | if (!signalled ()) { |
| 315 | schedule_timeout(NLMCLNT_GRACE_WAIT); | 315 | schedule_timeout(NLMCLNT_GRACE_WAIT); |
| 316 | try_to_freeze(PF_FREEZE); | 316 | try_to_freeze(); |
| 317 | if (!signalled ()) | 317 | if (!signalled ()) |
| 318 | status = 0; | 318 | status = 0; |
| 319 | } | 319 | } |
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c index c60e69431e..df0cba239d 100644 --- a/fs/xfs/linux-2.6/xfs_buf.c +++ b/fs/xfs/linux-2.6/xfs_buf.c | |||
| @@ -1771,9 +1771,9 @@ xfsbufd( | |||
| 1771 | 1771 | ||
| 1772 | INIT_LIST_HEAD(&tmp); | 1772 | INIT_LIST_HEAD(&tmp); |
| 1773 | do { | 1773 | do { |
| 1774 | if (unlikely(current->flags & PF_FREEZE)) { | 1774 | if (unlikely(freezing(current))) { |
| 1775 | xfsbufd_force_sleep = 1; | 1775 | xfsbufd_force_sleep = 1; |
| 1776 | refrigerator(PF_FREEZE); | 1776 | refrigerator(); |
| 1777 | } else { | 1777 | } else { |
| 1778 | xfsbufd_force_sleep = 0; | 1778 | xfsbufd_force_sleep = 0; |
| 1779 | } | 1779 | } |
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 5fe9af38aa..f6dd7de259 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
| @@ -483,7 +483,7 @@ xfssyncd( | |||
| 483 | set_current_state(TASK_INTERRUPTIBLE); | 483 | set_current_state(TASK_INTERRUPTIBLE); |
| 484 | timeleft = schedule_timeout(timeleft); | 484 | timeleft = schedule_timeout(timeleft); |
| 485 | /* swsusp */ | 485 | /* swsusp */ |
| 486 | try_to_freeze(PF_FREEZE); | 486 | try_to_freeze(); |
| 487 | if (vfsp->vfs_flag & VFS_UMOUNT) | 487 | if (vfsp->vfs_flag & VFS_UMOUNT) |
| 488 | break; | 488 | break; |
| 489 | 489 | ||
