From f41e8674d17ed721cc754ccb0dabd9178d72017d Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 16 May 2005 21:53:49 -0700 Subject: [PATCH] --- yaml --- r: 1166 b: refs/heads/master c: c64610ba585fabb36be78782868277f3d9741a2e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/buffer.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d634eef9313e..e98bca2f281e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c0547ba8b3bbd8b26ae35e33ac17ff51f67f78c +refs/heads/master: c64610ba585fabb36be78782868277f3d9741a2e diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c index 6f88dcc6d002..7e9e409feaa7 100644 --- a/trunk/fs/buffer.c +++ b/trunk/fs/buffer.c @@ -2094,9 +2094,12 @@ int block_read_full_page(struct page *page, get_block_t *get_block) continue; if (!buffer_mapped(bh)) { + int err = 0; + fully_mapped = 0; if (iblock < lblock) { - if (get_block(inode, iblock, bh, 0)) + err = get_block(inode, iblock, bh, 0); + if (err) SetPageError(page); } if (!buffer_mapped(bh)) { @@ -2104,7 +2107,8 @@ int block_read_full_page(struct page *page, get_block_t *get_block) memset(kaddr + i * blocksize, 0, blocksize); flush_dcache_page(page); kunmap_atomic(kaddr, KM_USER0); - set_buffer_uptodate(bh); + if (!err) + set_buffer_uptodate(bh); continue; } /*