Automatic merge with /usr/src/ntfs-2.6.git.

2 files changed, 6 insertions, 6 deletions

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 7c8387ed4192..79d07624bfe1 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -2359,9 +2359,9 @@ int jfsIOWait(void *arg)
                         lbmStartIO(bp);
                         spin_lock_irq(&log_redrive_lock);
                 }
-                if (current->flags & PF_FREEZE) {
+                if (freezing(current)) {
                         spin_unlock_irq(&log_redrive_lock);
-                        refrigerator(PF_FREEZE);
+                        refrigerator();
                 } else {
                         add_wait_queue(&jfs_IO_thread_wait, &wq);
                         set_current_state(TASK_INTERRUPTIBLE);
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)
                 /* In case a wakeup came while all threads were active */
                 jfs_commit_thread_waking = 0;
 
-                if (current->flags & PF_FREEZE) {
+                if (freezing(current)) {
                         LAZY_UNLOCK(flags);
-                        refrigerator(PF_FREEZE);
+                        refrigerator();
                 } else {
                         DECLARE_WAITQUEUE(wq, current);
 
@@ -2987,9 +2987,9 @@ int jfs_sync(void *arg)
                 /* Add anon_list2 back to anon_list */
                 list_splice_init(&TxAnchor.anon_list2, &TxAnchor.anon_list);
 
-                if (current->flags & PF_FREEZE) {
+                if (freezing(current)) {
                         TXN_UNLOCK();
-                        refrigerator(PF_FREEZE);
+                        refrigerator();
                 } else {
                         DECLARE_WAITQUEUE(wq, current);