Merge tag 'block-5.6-2020-02-28' of git://git.kernel.dk/linux-block

[tomoyo/tomoyo-test1.git] / mm / page_io.c

diff --git a/mm/page_io.c b/mm/page_io.c
index 3a198de..76965be 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -177,8 +177,9 @@ int generic_swapfile_activate(struct swap_info_struct *sis,
 
                cond_resched();
 
-               first_block = bmap(inode, probe_block);
-               if (first_block == 0)
+               first_block = probe_block;
+               ret = bmap(inode, &first_block);
+               if (ret || !first_block)
                        goto bad_bmap;
 
                /*
@@ -193,9 +194,11 @@ int generic_swapfile_activate(struct swap_info_struct *sis,
                                        block_in_page++) {
                        sector_t block;
 
-                       block = bmap(inode, probe_block + block_in_page);
-                       if (block == 0)
+                       block = probe_block + block_in_page;
+                       ret = bmap(inode, &block);
+                       if (ret || !block)
                                goto bad_bmap;
+
                        if (block != first_block + block_in_page) {
                                /* Discontiguity */
                                probe_block++;