Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.0.git;a=commitdiff;h=a671182190f7a37d8c331e93207bb807de4860f1

commit a671182190f7a37d8c331e93207bb807de4860f1
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Tue May 12 11:54:19 2009 +0200

kernel-2.6.28-6anacreon1-i686

- forgot to add jbd2.patch

diff --git a/source/base/kernel/jbd2.patch b/source/base/kernel/jbd2.patch
new file mode 100644
index 0000000..f5c5ab9
--- /dev/null
+++ b/source/base/kernel/jbd2.patch
@@ -0,0 +1,26 @@
+Fixes:
+
+In file included from fs/ocfs2/alloc.c:42:
+fs/ocfs2/journal.h: In function 'ocfs2_begin_ordered_truncate':
+fs/ocfs2/journal.h:451: warning: passing argument 1 of 
'jbd2_journal_begin_ordered_truncate' from incompatible pointer type
+fs/ocfs2/journal.h:451: warning: passing argument 2 of 
'jbd2_journal_begin_ordered_truncate' makes integer from pointer with
+out a cast
+fs/ocfs2/journal.h:451: error: too many arguments to function 
'jbd2_journal_begin_ordered_truncate'
+
+
+diff --git a/fs/ocfs2/ocfs2_jbd_compat.h b/fs/ocfs2/ocfs2_jbd_compat.h
+index b91c78f..268949b 100644
+--- a/fs/ocfs2/ocfs2_jbd_compat.h
++++ b/fs/ocfs2/ocfs2_jbd_compat.h
+@@ -60,7 +60,8 @@ static inline int jbd2_journal_file_inode(handle_t *handle,
+       return 0;
+ }
+
+-static inline int jbd2_journal_begin_ordered_truncate(struct jbd2_inode 
*inode,
++static inline int jbd2_journal_begin_ordered_truncate(journal_t *journal,
++                                                    struct jbd2_inode *inode,
+                                                     loff_t new_size)
+ {
+       return 0;
+
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to