diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 07:47:10 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 07:47:10 +0200 |
| commit | 949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (patch) | |
| tree | ca88fd8f8f81b167dc4685ed34e9636f267db60d /fs/buffer.c | |
| parent | [libata] ATA passthru (arbitrary ATA command execution) (diff) | |
| parent | Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.tar.xz linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.zip | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 6f88dcc6d002..7e9e409feaa7 100644 --- a/fs/buffer.c +++ b/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; } /* |