Merge tag 'v3.10.108' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / direct-io.c

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 53e505067cf3a9adefec8d61c2e0ef38259b26fb..9a8e36f76a183e1873d9208f5d84095ef1c67019 100644 (file)
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -790,7 +790,8 @@ out:
         */
        if (sdio->boundary) {
                ret = dio_send_cur_page(dio, sdio, map_bh);
-               dio_bio_submit(dio, sdio);
+               if (sdio->bio)
+                       dio_bio_submit(dio, sdio);
                page_cache_release(sdio->cur_page);
                sdio->cur_page = NULL;
        }
@@ -964,6 +965,7 @@ do_holes:
                                                i_size_aligned >> blkbits) {
                                        /* We hit eof */
                                        page_cache_release(page);
+                                       dio_cleanup(dio, sdio);
                                        goto out;
                                }
                                zero_user(page, block_in_page << blkbits,