X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Freiserfs%2Finode.c;h=192269698a8ac44b3b7c58a327d7fde6d35db375;hb=8f616cd5249e03c9e1b371623d85e76d4b86bbc1;hp=195309857e6323048e20b2286952e56b754b5301;hpb=dd07a8db7283f52f347aee468007556944b5b393;p=linux-2.6

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 195309857e..192269698a 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -45,6 +45,8 @@ void reiserfs_delete_inode(struct inode *inode)
 			goto out;
 		reiserfs_update_inode_transaction(inode);
 
+		reiserfs_discard_prealloc(&th, inode);
+
 		err = reiserfs_delete_object(&th, inode);
 
 		/* Do quota update inside a transaction for journaled quotas. We must do that
@@ -1536,7 +1538,7 @@ static struct dentry *reiserfs_get_dentry(struct super_block *sb,
 	if (!inode)
 		inode = ERR_PTR(-ESTALE);
 	if (IS_ERR(inode))
-		return ERR_PTR(PTR_ERR(inode));
+		return ERR_CAST(inode);
 	result = d_alloc_anon(inode);
 	if (!result) {
 		iput(inode);