aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ufs/balloc.c
diff options
context:
space:
mode:
authorEvgeniy Dushistov <dushistov@mail.ru>2006-08-05 12:13:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-08-06 08:57:46 -0700
commit06fa45d3a19c6fbfccbf295e9f08087492338631 (patch)
tree24cc6843b98272e8ef5a8a1c78ef5b452f4a2d84 /fs/ufs/balloc.c
parent1fb32b7bd8203d0175649a75ede3ee7634d6a941 (diff)
downloadmrst-s0i3-test-06fa45d3a19c6fbfccbf295e9f08087492338631.tar.gz
mrst-s0i3-test-06fa45d3a19c6fbfccbf295e9f08087492338631.tar.xz
mrst-s0i3-test-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>
Diffstat (limited to 'fs/ufs/balloc.c')
-rw-r--r--fs/ufs/balloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index b01804baa12..b8238147577 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;