diff options
| author | Evgeniy Dushistov <dushistov@mail.ru> | 2006-08-05 12:13:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-06 08:57:46 -0700 |
| commit | 06fa45d3a19c6fbfccbf295e9f08087492338631 (patch) | |
| tree | 24cc6843b98272e8ef5a8a1c78ef5b452f4a2d84 | |
| parent | 1fb32b7bd8203d0175649a75ede3ee7634d6a941 (diff) | |
| download | linux-stable-06fa45d3a19c6fbfccbf295e9f08087492338631.tar.gz linux-stable-06fa45d3a19c6fbfccbf295e9f08087492338631.tar.bz2 linux-stable-06fa45d3a19c6fbfccbf295e9f08087492338631.zip | |
[PATCH] ufs: handle truncated pages
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>
| -rw-r--r-- | fs/ufs/balloc.c | 2 | ||||
| -rw-r--r-- | fs/ufs/util.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c index b01804baa120..b82381475779 100644 --- a/fs/ufs/balloc.c +++ b/fs/ufs/balloc.c @@ -248,7 +248,7 @@ static void ufs_change_blocknr(struct inode *inode, unsigned int baseblk, if (likely(cur_index != index)) { page = ufs_get_locked_page(mapping, index); - if (IS_ERR(page)) + if (!page || IS_ERR(page)) /* it was truncated or EIO */ continue; } else page = locked_page; diff --git a/fs/ufs/util.c b/fs/ufs/util.c index 005d6815adf5..22f820a9b15c 100644 --- a/fs/ufs/util.c +++ b/fs/ufs/util.c @@ -251,7 +251,6 @@ struct page *ufs_get_locked_page(struct address_space *mapping, { struct page *page; -try_again: page = find_lock_page(mapping, index); if (!page) { page = read_cache_page(mapping, index, @@ -271,7 +270,8 @@ try_again: /* Truncate got there first */ unlock_page(page); page_cache_release(page); - goto try_again; + page = NULL; + goto out; } if (!PageUptodate(page) || PageError(page)) { |