Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / fs / direct-io.c

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 38484b08a39ac93ef024a72b9b2833b84e6c44f2..7ab90f5081eebc4ab8b0de88bef8d0b6310ed113 100644 (file)
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -37,6 +37,7 @@
 #include <linux/uio.h>
 #include <linux/atomic.h>
 #include <linux/prefetch.h>
+#include <linux/aio.h>
 
 /*
  * How many user pages to map in one call to get_user_pages().  This determines
@@ -672,12 +673,6 @@ static inline int dio_send_cur_page(struct dio *dio, struct dio_submit *sdio,
                if (sdio->final_block_in_bio != sdio->cur_page_block ||
                    cur_offset != bio_next_offset)
                        dio_bio_submit(dio, sdio);
-               /*
-                * Submit now if the underlying fs is about to perform a
-                * metadata read
-                */
-               else if (sdio->boundary)
-                       dio_bio_submit(dio, sdio);
        }
 
        if (sdio->bio == NULL) {
@@ -737,16 +732,6 @@ submit_page_section(struct dio *dio, struct dio_submit *sdio, struct page *page,
            sdio->cur_page_block +
            (sdio->cur_page_len >> sdio->blkbits) == blocknr) {
                sdio->cur_page_len += len;
-
-               /*
-                * If sdio->boundary then we want to schedule the IO now to
-                * avoid metadata seeks.
-                */
-               if (sdio->boundary) {
-                       ret = dio_send_cur_page(dio, sdio, map_bh);
-                       page_cache_release(sdio->cur_page);
-                       sdio->cur_page = NULL;
-               }
                goto out;
        }
 
@@ -758,7 +743,7 @@ submit_page_section(struct dio *dio, struct dio_submit *sdio, struct page *page,
                page_cache_release(sdio->cur_page);
                sdio->cur_page = NULL;
                if (ret)
-                       goto out;
+                       return ret;
        }
 
        page_cache_get(page);           /* It is in dio */
@@ -768,6 +753,16 @@ submit_page_section(struct dio *dio, struct dio_submit *sdio, struct page *page,
        sdio->cur_page_block = blocknr;
        sdio->cur_page_fs_offset = sdio->block_in_file << sdio->blkbits;
 out:
+       /*
+        * If sdio->boundary then we want to schedule the IO now to
+        * avoid metadata seeks.
+        */
+       if (sdio->boundary) {
+               ret = dio_send_cur_page(dio, sdio, map_bh);
+               dio_bio_submit(dio, sdio);
+               page_cache_release(sdio->cur_page);
+               sdio->cur_page = NULL;
+       }
        return ret;
 }
 
@@ -969,7 +964,8 @@ do_holes:
                        this_chunk_bytes = this_chunk_blocks << blkbits;
                        BUG_ON(this_chunk_bytes == 0);
 
-                       sdio->boundary = buffer_boundary(map_bh);
+                       if (this_chunk_blocks == sdio->blocks_available)
+                               sdio->boundary = buffer_boundary(map_bh);
                        ret = submit_page_section(dio, sdio, page,
                                                  offset_in_page,
                                                  this_chunk_bytes,