From 19857825eb53cfa6b9c48d9b1c7cf3e09325f7d7 Mon Sep 17 00:00:00 2001 From: "Chen, Kenneth W" Date: Mon, 22 Jan 2007 20:40:43 -0800 Subject: [PATCH] --- yaml --- r: 45719 b: refs/heads/master c: cda9205da24aeaa8fb086b0fb85cdf39571ecc3f h: refs/heads/master i: 45717: 32be373bead6d413b4ce22266f99632ce9c05006 45715: b5d637dd7f42e6a6eaa4ca9018d2fea1a85d0c22 45711: 16e0982b8a9dbc67d9d9aa7f2a7ffae97149479b v: v3 --- [refs] | 2 +- trunk/fs/block_dev.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b3d3615e7907..958b3ed7fff4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15c945c3d0913d73a7d57d7a0a3c4e2902598cc6 +refs/heads/master: cda9205da24aeaa8fb086b0fb85cdf39571ecc3f diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c index da020be25dd2..d9bdf2b3ade2 100644 --- a/trunk/fs/block_dev.c +++ b/trunk/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 @@ blkdev_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, count = min(count, nbytes); goto same_bio; } + } else { + blk_unget_page(page, &pvec); } /* bio is ready, submit it */