Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[karo-tx-linux.git] / fs / xfs / xfs_buf.c

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 33e06d22168cf10c0976c5f663728d9f70ac0da5..4dff85c7d7eb1feda7999ff05f9941f6c42077ff 100644 (file)
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1701,12 +1701,8 @@ xfsbufd(
                struct list_head tmp;
                struct blk_plug plug;
 
-               if (unlikely(freezing(current))) {
-                       set_bit(XBT_FORCE_SLEEP, &target->bt_flags);
-                       refrigerator();
-               } else {
-                       clear_bit(XBT_FORCE_SLEEP, &target->bt_flags);
-               }
+               if (unlikely(freezing(current)))
+                       try_to_freeze();
 
                /* sleep for a long time if there is nothing to do. */
                if (list_empty(&target->bt_delwri_queue))