redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[PATCH] ufs: handle truncated pages

Browse source 
ufs_get_locked_page is called twice in ufs code, one time in ufs_truncate
path(we allocated last block), and another time when fragments are
reallocated.  In ideal world in the second case on allocation/free block
layer we should not know that things like `truncate' exists, but now with
such crutch like ufs_get_locked_page we can (or should?) skip truncated
pages.

Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Evgeniy Dushistov 2006-08-05 12:13:57 -07:00 committed by Linus Torvalds
parent 1fb32b7bd8
commit 06fa45d3a1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/ufs/balloc.c
View file

@ -248,7 +248,7 @@ static void ufs_change_blocknr(struct inode *inode, unsigned int baseblk,
if (likely(cur_index != index)) { if (likely(cur_index != index)) {
page = ufs_get_locked_page(mapping, index); page = ufs_get_locked_page(mapping, index);
if (IS_ERR(page)) if (!page || IS_ERR(page)) /* it was truncated or EIO */
continue; continue;
} else } else
page = locked_page; page = locked_page;

4
fs/ufs/util.c
View file

@ -251,7 +251,6 @@ struct page *ufs_get_locked_page(struct address_space *mapping,
{ {
struct page *page; struct page *page;
try_again:
page = find_lock_page(mapping, index); page = find_lock_page(mapping, index);
if (!page) { if (!page) {
page = read_cache_page(mapping, index, page = read_cache_page(mapping, index,
@ -271,7 +270,8 @@ try_again:
/* Truncate got there first */ /* Truncate got there first */
unlock_page(page); unlock_page(page);
page_cache_release(page); page_cache_release(page);
goto try_again; page = NULL;
goto out;
} }
if (!PageUptodate(page) || PageError(page)) { if (!PageUptodate(page) || PageError(page)) {