another .25 patch

diff --git a/queue-2.6.25/reiserfs-discard-prealloc-in-reiserfs_delete_inode.patch b/queue-2.6.25/reiserfs-discard-prealloc-in-reiserfs_delete_inode.patch
new file mode 100644 (file)
index 0000000..0cdc21f
--- /dev/null
+++ b/queue-2.6.25/reiserfs-discard-prealloc-in-reiserfs_delete_inode.patch
@@ -0,0 +1,36 @@
+From eb35c218d83ec0780d9db869310f2e333f628702 Mon Sep 17 00:00:00 2001
+From: Jeff Mahoney <jeffm@suse.com>
+Date: Tue, 8 Jul 2008 14:37:06 -0400
+Subject: reiserfs: discard prealloc in reiserfs_delete_inode
+
+From: Jeff Mahoney <jeffm@suse.com>
+
+commit eb35c218d83ec0780d9db869310f2e333f628702 upstream
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/reiserfs/inode.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/fs/reiserfs/inode.c
++++ b/fs/reiserfs/inode.c
+@@ -45,6 +45,8 @@ void reiserfs_delete_inode(struct 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

diff --git a/queue-2.6.25/series b/queue-2.6.25/series
index ac719d78bfa0775959f0dff1582694c5af080631..39634356cf8eb4ace0990d80b222ec149fb9c51a 100644 (file)
--- a/queue-2.6.25/series
+++ b/queue-2.6.25/series
@@ -18,3 +18,4 @@ scsi-esp-fix-oops-in-esp_reset_cleanup.patch
 scsi-esp-tidy-up-target-reference-counting.patch
 scsi-ses-fix-timeout.patch
 mm-switch-node-meminfo-active-inactive-pages-to-kbytes.patch
+reiserfs-discard-prealloc-in-reiserfs_delete_inode.patch