summaryrefslogtreecommitdiff
path: root/fs/ufs/balloc.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-08-06 15:44:39 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-06 15:44:39 -0700
commitdbd43d08642c037beb937c2670976c076120507b (patch)
tree4d44a4b54a731eb290e040345c38ed9e1e7ecc6a /fs/ufs/balloc.c
parentc34c07d6946ec8969fa71ba03dbb95091f4eb9d3 (diff)
parent9f737633e6ee54fc174282d49b2559bd2208391d (diff)
downloadlinux-rt-dbd43d08642c037beb937c2670976c076120507b.tar.gz
Merge branch 'master' of /home/greg/linux/git/torvalds-2.6/
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 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;