summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2008-07-08 14:37:06 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-08 12:39:31 -0700
commiteb35c218d83ec0780d9db869310f2e333f628702 (patch)
treed958661099c79352c36508784720c89d12ad1682 /fs
parent90621ed829ac64eb25b4d1214e9a5155e5c67ff2 (diff)
downloadop-kernel-dev-eb35c218d83ec0780d9db869310f2e333f628702.zip
op-kernel-dev-eb35c218d83ec0780d9db869310f2e333f628702.tar.gz
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 <jeffm@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/reiserfs/inode.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 5791793..1922696 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
OpenPOWER on IntegriCloud