block: don't use un-ordered __set_current_state(TASK_UNINTERRUPTIBLE)

[linux-2.6-block.git] / fs / iomap.c

diff --git a/fs/iomap.c b/fs/iomap.c
index e87c288cd5ef6d3abe5aee1002f83fd2369986d6..a3088fae567ba3092735667e4f9ac2595a1814b1 100644 (file)
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -563,7 +563,7 @@ iomap_migrate_page(struct address_space *mapping, struct page *newpage,
 {
        int ret;
 
-       ret = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0);
+       ret = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
        if (ret != MIGRATEPAGE_SUCCESS)
                return ret;
 
@@ -1921,8 +1921,7 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
                        return -EIOCBQUEUED;
 
                for (;;) {
-                       __set_current_state(TASK_UNINTERRUPTIBLE);
-
+                       set_current_state(TASK_UNINTERRUPTIBLE);
                        if (!READ_ONCE(dio->submit.waiter))
                                break;