rpms/kernel/F-10 ext4.git-fixes.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.34, 1.1206.2.35

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14790

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	ext4.git-fixes.patch 
Log Message:
Fix bug in ext4 patch queue.

ext4.git-fixes.patch:

--- NEW FILE ext4.git-fixes.patch ---

In file included from fs/ocfs2/alloc.c:42:
fs/ocfs2/journal.h: In function 'ocfs2_jbd2_file_inode':
fs/ocfs2/journal.h:420: error: implicit declaration of function 'jbd2_journal_file_inode'
fs/ocfs2/journal.h:420: error: 'struct ocfs2_inode_info' has no member named 'ip_jinode'
fs/ocfs2/journal.h: In function 'ocfs2_begin_ordered_truncate':
fs/ocfs2/journal.h:426: error: implicit declaration of function 'jbd2_journal_begin_ordered_truncate'
fs/ocfs2/journal.h:428: error: 'struct ocfs2_inode_info' has no member named 'ip_jinode'

[caused by the ext4 patch queue]

--- linux-2.6.27.noarch.orig/fs/ocfs2/journal.h
+++ linux-2.6.27.noarch/fs/ocfs2/journal.h
@@ -415,17 +415,4 @@ static inline int ocfs2_calc_tree_trunc_
 	return credits;
 }
 
-static inline int ocfs2_jbd2_file_inode(handle_t *handle, struct inode *inode)
-{
-	return jbd2_journal_file_inode(handle, &OCFS2_I(inode)->ip_jinode);
-}
-
-static inline int ocfs2_begin_ordered_truncate(struct inode *inode,
-					       loff_t new_size)
-{
-	return jbd2_journal_begin_ordered_truncate(
-				OCFS2_SB(inode->i_sb)->journal->j_journal,
-				&OCFS2_I(inode)->ip_jinode,
-				new_size);
-}
 #endif /* OCFS2_JOURNAL_H */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.34
retrieving revision 1.1206.2.35
diff -u -r1.1206.2.34 -r1.1206.2.35
--- kernel.spec	23 Feb 2009 13:45:16 -0000	1.1206.2.34
+++ kernel.spec	23 Feb 2009 17:34:58 -0000	1.1206.2.35
@@ -755,6 +755,9 @@
 Patch2915: ext4.git-b700ed3dc05f63c2cb0b39a31d1e21086f021643.patch
 Patch2916: ext4.git-ed858e512ee4f761edce33b7c97fcd39a6804c29.patch
 
+# fix problems(s) in ext4 queue
+Patch2920: ext4.git-fixes.patch
+
 # Add better support for DMI-based autoloading
 Patch3110: linux-2.6-dmi-autoload.patch
 
@@ -1186,6 +1189,8 @@
 ApplyPatch ext4.git-b700ed3dc05f63c2cb0b39a31d1e21086f021643.patch
 ApplyPatch ext4.git-ed858e512ee4f761edce33b7c97fcd39a6804c29.patch
 
+ApplyPatch ext4.git-fixes.patch
+
 # xfs
 
 # USB
@@ -1958,6 +1963,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Feb 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.19-170.2.35
+- Fix bug in ext4 patch queue.
+
 * Mon Feb 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.19-170.2.34
 - Add ext4 stable patch queue from:
   http://git.kernel.org/?p=linux/kernel/git/tytso/ext4.git;a=shortlog;h=for-stable-2.6.27