add fix for jfs compilation

diff --git a/Makefile b/Makefile
index b303af21f6dc1967c466d732abe38a9c84cb3e45..ba443b843a3899813bd9165e8f2f96352e666ad1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -207,6 +207,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        #cd ${KERNEL_SRC}; patch -p1 <../fix-nfs-block-count.patch
        cd ${KERNEL_SRC}; patch -p1 <../fix-idr-header-for-drbd-compilation.patch
        cd ${KERNEL_SRC}; patch -p1 <../kvm-x86-ignore-ioapic-polarity.patch
+       cd ${KERNEL_SRC}; patch -p1 <../fix-jfs-compile-error.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 

diff --git a/changelog.Debian b/changelog.Debian
index a7b720d891bc9acc1eeba9dc23a20550133b5b0a..1fdb536752906304861776a1d290ff0d559a37a7 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -3,6 +3,8 @@ pve-kernel-2.6.32 (2.6.32-158) unstable; urgency=low
   * update to vzkernel-2.6.32-042stab110.1.src.rpm
   
   * bump kernel API to 40-pve
+  
+  * re-enable JFS (add patch fix-jfs-compile-error.patch)
 
  -- Proxmox Support Team <support@proxmox.com>  Mon, 8 Jul 2015 08:42:37 +0200
 

diff --git a/fix-jfs-compile-error.patch b/fix-jfs-compile-error.patch
new file mode 100644 (file)
index 0000000..f5dd659
--- /dev/null
+++ b/fix-jfs-compile-error.patch
@@ -0,0 +1,11 @@
+--- linux-2.6-2.6.32/fs/jfs/inode.c.org        2015-07-21 05:57:13.000000000 +0200
++++ linux-2.6-2.6.32/fs/jfs/inode.c    2015-07-21 05:57:20.000000000 +0200
+@@ -169,7 +169,7 @@
+       clear_inode(inode);
+ }
+ 
+-void jfs_dirty_inode(struct inode *inode, int flags)
++void jfs_dirty_inode(struct inode *inode)
+ {
+       static int noisy = 5;
+