Merge tag 'nfsd-4.8' of git://linux-nfs.org/~bfields/linux

[linux-2.6-block.git] / mm / page_io.c

diff --git a/mm/page_io.c b/mm/page_io.c
index dcc5d3769608088a8c100f04f4e01dcccf5b74da..fb1fa269d3a06416151a2b3ef9e57a1e99ae4db5 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -166,6 +166,8 @@ int generic_swapfile_activate(struct swap_info_struct *sis,
                unsigned block_in_page;
                sector_t first_block;
 
+               cond_resched();
+
                first_block = bmap(inode, probe_block);
                if (first_block == 0)
                        goto bad_bmap;