From: Jeff Mahoney Date: Tue, 8 Jul 2008 18:37:06 +0000 (-0400) Subject: reiserfs: discard prealloc in reiserfs_delete_inode X-Git-Tag: MMI-PSA29.97-13-9~33749 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eb35c218d83ec0780d9db869310f2e333f628702;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git reiserfs: discard prealloc in reiserfs_delete_inode With the removal of struct file from the xattr code, reiserfs_file_release() isn't used anymore, so the prealloc isn't discarded. This causes hangs later down the line. This patch adds it to reiserfs_delete_inode. In most cases it will be a no-op due to it already having been called, but will avoid hangs with xattrs. Signed-off-by: Jeff Mahoney Signed-off-by: Linus Torvalds --- diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 57917932212e..192269698a8a 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