aboutsummaryrefslogtreecommitdiff
path: root/fs/reiserfs/inode.c
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2008-07-11 21:57:40 +1000
committerNeil Brown <neilb@suse.de>2008-07-11 21:57:40 +1000
commit0306d5efbf897c7d410fd30b89fc7d97372aa501 (patch)
tree668811bca39ca7c1585da88d52ec2f0a43216c0e /fs/reiserfs/inode.c
parentf9f278fefdbbbf198bb4111b3fba47d9043dae59 (diff)
parente5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff)
Merge branch 'master' into for-next
Diffstat (limited to 'fs/reiserfs/inode.c')
-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 57917932212..192269698a8 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