Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 1166
b: refs/heads/master
c: c64610b
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed May 17, 2005
1 parent da0bf6e commit f41e867
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3c0547ba8b3bbd8b26ae35e33ac17ff51f67f78c
refs/heads/master: c64610ba585fabb36be78782868277f3d9741a2e
8 changes: 6 additions & 2 deletions trunk/fs/buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -2094,17 +2094,21 @@ 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)) {
void *kaddr = kmap_atomic(page, KM_USER0);
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;
}
/*
Expand Down

0 comments on commit f41e867

Please sign in to comment.