diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-07 12:38:41 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-07 12:38:41 +0200 |
commit | 242898be7a1921f646ca529ddc26d7337c69922f (patch) | |
tree | 674adf64ca6254318dab5bcd428ebe8ac73957ff /fs/ufs/balloc.c | |
parent | Merge branch 'master' into upstream (diff) | |
parent | Linux v2.6.18-rc4 (diff) | |
download | linux-242898be7a1921f646ca529ddc26d7337c69922f.tar.xz linux-242898be7a1921f646ca529ddc26d7337c69922f.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/ufs/balloc.c')
-rw-r--r-- | fs/ufs/balloc.c | 2 |
1 files changed, 1 insertions, 1 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; |