diff options
| author | Chen, Kenneth W <kenneth.w.chen@intel.com> | 2007-01-23 05:40:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 16:52:06 +0100 |
| commit | cda9205da24aeaa8fb086b0fb85cdf39571ecc3f (patch) | |
| tree | c302c3d0b0558d3fc5ac0b5750e4f8150517ece5 /fs/block_dev.c | |
| parent | [PATCH] rtc-sh: act on rtc_wkalrm.enabled when setting an alarm (diff) | |
| download | linux-cda9205da24aeaa8fb086b0fb85cdf39571ecc3f.tar.xz linux-cda9205da24aeaa8fb086b0fb85cdf39571ecc3f.zip | |
[PATCH] fix blk_direct_IO bio preparation
For large size DIO that needs multiple bio, one full page worth of data was
lost at the boundary of bio's maximum sector or segment limits. After a
bio is full and got submitted. The outer while (nbytes) { ... } loop will
allocate a new bio and just march on to index into next page. It just
forgets about the page that bio_add_page() rejected when previous bio is
full. Fix it by put the rejected page back to pvec so we pick it up again
for the next bio.
Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index da020be25dd2..d9bdf2b3ade2 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -190,6 +190,12 @@ static struct page *blk_get_page(unsigned long addr, size_t count, int rw, return pvec->page[pvec->idx++]; } +/* return a page back to pvec array */ +static void blk_unget_page(struct page *page, struct pvec *pvec) +{ + pvec->page[--pvec->idx] = page; +} + static ssize_t blkdev_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs) @@ -278,6 +284,8 @@ same_bio: count = min(count, nbytes); goto same_bio; } + } else { + blk_unget_page(page, &pvec); } /* bio is ready, submit it */ |