vfs: Avoid softlockups with sendfile(2)

[linux-2.6-block.git] / fs / direct-io.c

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 7025029c666f5f6e7099c3b6a7dcf0f12687138b..cb5337d8c273a5dd58e97d9be587fb56d643e52a 100644 (file)
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -363,7 +363,7 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio,
 
        /*
         * bio_alloc() is guaranteed to return a bio when called with
-        * __GFP_WAIT and we request a valid number of vectors.
+        * __GFP_RECLAIM and we request a valid number of vectors.
         */
        bio = bio_alloc(GFP_KERNEL, nr_vecs);
 
@@ -399,14 +399,14 @@ static inline void dio_bio_submit(struct dio *dio, struct dio_submit *sdio)
        if (dio->is_async && dio->rw == READ && dio->should_dirty)
                bio_set_pages_dirty(bio);
 
+       dio->bio_bdev = bio->bi_bdev;
+
        if (sdio->submit_io) {
                sdio->submit_io(dio->rw, bio, dio->inode,
                               sdio->logical_offset_in_bio);
                dio->bio_cookie = BLK_QC_T_NONE;
-       } else {
+       } else
                dio->bio_cookie = submit_bio(dio->rw, bio);
-               dio->bio_bdev = bio->bi_bdev;
-       }
 
        sdio->bio = NULL;
        sdio->boundary = 0;