diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-13 09:57:38 -0400 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-13 09:57:38 -0400 |
commit | f7f24758ac98a506770bc5910d33567610fa3403 (patch) | |
tree | ff7fad3d01bf9dc2e2e54b908f9fca4891e1ee72 /fs/jfs/jfs_txnmgr.c | |
parent | b38a3ab3d1bb0dc3288f73903d4dc4672b5cd2d0 (diff) | |
parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'fs/jfs/jfs_txnmgr.c')
-rw-r--r-- | fs/jfs/jfs_txnmgr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index 8cbaaff1d5fa..121c981ff453 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 | ||