rpms/kernel/F-8 linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch, NONE, 1.1 kernel.spec, 1.490, 1.491

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28615

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch 
Log Message:
* Wed Jul 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.10-51
- Fix reiserfs list corruption (F9#453699)


linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch:

--- NEW FILE linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch ---
From: Jeff Mahoney <jeffm at suse.com>
Date: Tue, 8 Jul 2008 18:37:06 +0000 (-0400)
Subject: reiserfs: discard prealloc in reiserfs_delete_inode
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=eb35c218d83ec0780d9db869310f2e333f628702

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 at suse.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

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


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- kernel.spec	10 Jul 2008 03:54:25 -0000	1.490
+++ kernel.spec	10 Jul 2008 04:11:40 -0000	1.491
@@ -624,6 +624,7 @@
 Patch426: linux-2.6-fs-fat-cleanup-code.patch
 Patch427: linux-2.6-fs-fat-fix-setattr.patch
 Patch428: linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch
+Patch429: linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch431: linux-2.6-net-l2tp-fix-potential-memory-corruption-in-pppol2tp_recvmsg.patch
@@ -1113,6 +1114,8 @@
 ApplyPatch linux-2.6-fs-fat-cleanup-code.patch
 ApplyPatch linux-2.6-fs-fat-fix-setattr.patch
 ApplyPatch linux-2.6-fs-fat-relax-permission-check-of-fat_setattr.patch
+# fix reiserfs hang (from F9)
+ApplyPatch linux-2.6-fs-reiserfs-discard-prealloc-in-delete_inode.patch
 
 # Networking
 # Disable easy to trigger printk's.
@@ -1830,18 +1833,21 @@
 
 
 %changelog
-* Wed Jul 09 2008 Jarod Wilson <jwilson at redhat.com> 2.6.25.9-50
+* Wed Jul 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.10-51
+- Fix reiserfs list corruption (F9#453699)
+
+* Wed Jul 09 2008 Jarod Wilson <jwilson at redhat.com> 2.6.25.10-50
 - Actually fix lirc_i2c oops and add new MCE receiver support this
   time, never actually made it in here... (#453348)
 
-* Wed Jul 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.9-49
+* Wed Jul 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.10-49
 - hdaps: support new Lenovo notebook models (F9#449888)
 
-* Tue Jul 08 2008 John W. Linville <linville at redhat.com> 2.6.25.9-48
+* Tue Jul 08 2008 John W. Linville <linville at redhat.com> 2.6.25.10-48
 - Upstream wireless fixes from 2008-07-07
   (http://marc.info/?l=linux-wireless&m=121546143025524&w=2)
 
-* Mon Jul 07 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.9-47
+* Mon Jul 07 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.10-47
 - Disable file capabilities.
 - Fix USB interrupt handling with shared interrupts.
 
@@ -1853,7 +1859,7 @@
 - Apply Stefan Becker's fix for bad hunk of wireless build fixups for 2.6.25
   (https://bugzilla.redhat.com/show_bug.cgi?id=453390#c36)
 
-* Thu Jul 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.9-42
+* Thu Jul 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.10-42
 - Linux 2.6.25.10
 - Reverted stable patch, not needed with utrace:
 	x86_64-ptrace-fix-sys32_ptrace-task_struct-leak.patch