diff --git a/[refs] b/[refs]
index 4972d7eb0a48..d4752391b2be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bf25cb40d899eeb5a471f497e56ddfe2c96c019
+refs/heads/master: 948b9b2c967c3bec6136b2dbb9e1c12f62e03efa
diff --git a/trunk/fs/udf/truncate.c b/trunk/fs/udf/truncate.c
index 0449b2216e71..0e328cdc9a45 100644
--- a/trunk/fs/udf/truncate.c
+++ b/trunk/fs/udf/truncate.c
@@ -88,8 +88,9 @@ void udf_discard_prealloc(struct inode * inode)
 	{
 		etype = netype;
 		lbcount += elen;
-		if (lbcount > inode->i_size && lbcount - inode->i_size < inode->i_sb->s_blocksize)
+		if (lbcount > inode->i_size && lbcount - elen < inode->i_size)
 		{
+			WARN_ON(lbcount - inode->i_size >= inode->i_sb->s_blocksize);
 			nelen = elen - (lbcount - inode->i_size);
 			epos.offset -= adsize;
 			extent_trunc(inode, &epos, eloc, etype, elen, nelen);
@@ -119,6 +120,7 @@ void udf_discard_prealloc(struct inode * inode)
 	}
 	UDF_I_LENEXTENTS(inode) = lbcount;
 
+	WARN_ON(lbcount != inode->i_size);
 	brelse(epos.bh);
 }