The following commit has been merged in the master branch:
commit 28f0e23ce8f152cfd07dc31e6c4a140732ba6a5f
Author: Patrick Winnertz <win...@debian.org>
Date: Thu Jun 4 15:20:48 2009 +0200
Add small patch to build modules on > 2.6.24er kernel this is adopted from
b_release_1.8.1 branch
Signed-off-by: Patrick Winnertz <win...@debian.org>
diff --git a/debian/patches/00list b/debian/patches/00list
index 2475e1e..3f2f4f6 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -21,3 +21,4 @@ fix-lustre-manpage.dpatch
enable-quota.dpatch
fix-symlink-attack.dpatch
use_bash_instead_of_sh.dpatch
+bio_errors.dpatch
diff --git a/debian/patches/bio_errors.dpatch b/debian/patches/bio_errors.dpatch
new file mode 100755
index 0000000..9e6c171
--- /dev/null
+++ b/debian/patches/bio_errors.dpatch
@@ -0,0 +1,80 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bio_errors.dpatch by Patrick Winnertz <win...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre-core.m4
+--- lustre~/lustre/autoconf/lustre-core.m4 2009-06-02 11:38:56.000000000
+0200
++++ lustre/lustre/autoconf/lustre-core.m4 2009-06-04 15:16:45.000000000
+0200
+@@ -1390,6 +1390,22 @@
+ ])
+ ])
+
++# 2.6.24 has bio_endio with 2 args
++AC_DEFUN([LC_BIO_ENDIO_2ARG],
++[AC_MSG_CHECKING([if kernel has bio_endio with 2 args])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/bio.h>
++],[
++ bio_endio(NULL, 0);
++], [
++ AC_MSG_RESULT([yes])
++ AC_DEFINE(HAVE_BIO_ENDIO_2ARG, 1,
++ [if kernel has bio_endio with 2 args])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
+ #
+ # LC_PROG_LINUX
+ #
+@@ -1503,6 +1519,8 @@
+ LC_UNREGISTER_BLKDEV_RETURN_INT
+ LC_KERNEL_SPLICE_READ
+ LC_HAVE_EXPORTFS_H
++ LC_BIO_ENDIO_2ARG
++
+ ])
+
+ #
+diff -urNad lustre~/lustre/include/linux/lustre_compat25.h
lustre/lustre/include/linux/lustre_compat25.h
+--- lustre~/lustre/include/linux/lustre_compat25.h 2009-06-02
11:38:56.000000000 +0200
++++ lustre/lustre/include/linux/lustre_compat25.h 2009-06-04
15:12:23.000000000 +0200
+@@ -472,5 +472,13 @@
+ #define sysctl_vfs_cache_pressure 100
+ #endif
+
++#ifdef HAVE_BIO_ENDIO_2ARG
++#define cfs_bio_io_error(a,b) bio_io_error((a))
++#define cfs_bio_endio(a,b,c) bio_endio((a),(c))
++#else
++#define cfs_bio_io_error(a,b) bio_io_error((a),(b))
++#define cfs_bio_endio(a,b,c) bio_endio((a),(b),(c))
++#endif
++
+ #endif /* __KERNEL__ */
+ #endif /* _COMPAT25_H */
+diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c
+--- lustre~/lustre/llite/lloop.c 2009-06-02 11:38:20.000000000 +0200
++++ lustre/lustre/llite/lloop.c 2009-06-04 15:12:41.000000000 +0200
+@@ -347,7 +347,7 @@
+ loop_add_bio(lo, old_bio);
+ return 0;
+ err:
+- bio_io_error(old_bio, old_bio->bi_size);
++ cfs_bio_io_error(old_bio, old_bio->bi_size);
+ return 0;
+ }
+
+@@ -369,7 +369,7 @@
+ while (bio) {
+ struct bio *tmp = bio->bi_next;
+ bio->bi_next = NULL;
+- bio_endio(bio, bio->bi_size, ret);
++ cfs_bio_endio(bio, bio->bi_size, ret);
+ bio = tmp;
+ }
+ }
--
Lustre Debian Packaging
_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit
