[Pkg-lustre-svn-commit] updated: [89ad318] Forgot a configure check for LC_FH_TO_DENTRY

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 89ad31879debf4e3528384b4fb9d3da71afca848
Author: Patrick Winnertz <winnie at debian.org>
Date:   Fri Jun 5 13:51:56 2009 +0200

    Forgot a configure check for LC_FH_TO_DENTRY
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/bio_errors.dpatch b/debian/patches/bio_errors.dpatch
index d6d8b91..7f409a5 100755
--- a/debian/patches/bio_errors.dpatch
+++ b/debian/patches/bio_errors.dpatch
@@ -6,9 +6,9 @@
 
 @DPATCH@
 diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
---- lustre~/lustre/autoconf/lustre-core.m4	2009-06-05 12:14:33.000000000 +0200
-+++ lustre/lustre/autoconf/lustre-core.m4	2009-06-05 12:14:34.000000000 +0200
-@@ -1390,6 +1390,41 @@
+--- lustre~/lustre/autoconf/lustre-core.m4	2009-06-05 13:46:25.000000000 +0200
++++ lustre/lustre/autoconf/lustre-core.m4	2009-06-05 13:50:38.000000000 +0200
+@@ -1390,6 +1390,63 @@
  ])
  ])
  
@@ -47,22 +47,45 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
 +])
 +])
 +
++# 2.6.24 has new members in exports struct.
++AC_DEFUN([LC_FH_TO_DENTRY],
++[AC_MSG_CHECKING([if kernel has .fh_to_dentry member in export_operations struct])
++LB_LINUX_TRY_COMPILE([
++#ifdef HAVE_LINUX_EXPORTFS_H
++        #include <linux/exportfs.h>
++#else
++        #include <linux/fs.h>
++#endif
++],[
++        struct export_operations exp;
++
++        exp.fh_to_dentry   = NULL;
++], [
++        AC_MSG_RESULT([yes])
++        AC_DEFINE(HAVE_FH_TO_DENTRY, 1,
++                [kernel has .fh_to_dentry member in export_operations struct])
++],[
++        AC_MSG_RESULT([no])
++])
++])
++
  #
  # LC_PROG_LINUX
  #
-@@ -1503,6 +1538,9 @@
+@@ -1503,6 +1560,10 @@
            LC_UNREGISTER_BLKDEV_RETURN_INT
            LC_KERNEL_SPLICE_READ
            LC_HAVE_EXPORTFS_H
 +       	LC_BIO_ENDIO_2ARG
 +	LC_KERNEL_SENDFILE
++	LC_FH_TO_DENTRY
 +
  ])
  
  #
 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-05 12:14:33.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_compat25.h	2009-06-05 12:14:34.000000000 +0200
+--- lustre~/lustre/include/linux/lustre_compat25.h	2009-06-05 13:46:25.000000000 +0200
++++ lustre/lustre/include/linux/lustre_compat25.h	2009-06-05 13:46:26.000000000 +0200
 @@ -472,5 +472,13 @@
  #define	sysctl_vfs_cache_pressure	100
  #endif
@@ -78,8 +101,8 @@ diff -urNad lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include
  #endif /* __KERNEL__ */
  #endif /* _COMPAT25_H */
 diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
---- lustre~/lustre/llite/file.c	2009-06-05 12:14:33.000000000 +0200
-+++ lustre/lustre/llite/file.c	2009-06-05 12:14:34.000000000 +0200
+--- lustre~/lustre/llite/file.c	2009-06-05 13:46:25.000000000 +0200
++++ lustre/lustre/llite/file.c	2009-06-05 13:46:26.000000000 +0200
 @@ -1858,6 +1858,9 @@
  #endif
  }
@@ -130,7 +153,7 @@ diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
          .flock          = ll_file_noflock,
 diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c
 --- lustre~/lustre/llite/llite_nfs.c	2009-06-02 11:38:20.000000000 +0200
-+++ lustre/lustre/llite/llite_nfs.c	2009-06-05 12:26:41.000000000 +0200
++++ lustre/lustre/llite/llite_nfs.c	2009-06-05 13:46:26.000000000 +0200
 @@ -68,36 +68,30 @@
  }
  
@@ -414,7 +437,7 @@ diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c
  #endif
 diff -urNad lustre~/lustre/llite/llite_nfs.c.orig lustre/lustre/llite/llite_nfs.c.orig
 --- lustre~/lustre/llite/llite_nfs.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ lustre/lustre/llite/llite_nfs.c.orig	2009-06-05 12:26:34.000000000 +0200
++++ lustre/lustre/llite/llite_nfs.c.orig	2009-06-05 13:46:26.000000000 +0200
 @@ -0,0 +1,286 @@
 +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
 + * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -704,7 +727,7 @@ diff -urNad lustre~/lustre/llite/llite_nfs.c.orig lustre/lustre/llite/llite_nfs.
 +#endif
 diff -urNad lustre~/lustre/llite/llite_nfs.c~ lustre/lustre/llite/llite_nfs.c~
 --- lustre~/lustre/llite/llite_nfs.c~	1970-01-01 01:00:00.000000000 +0100
-+++ lustre/lustre/llite/llite_nfs.c~	2009-06-05 12:14:34.000000000 +0200
++++ lustre/lustre/llite/llite_nfs.c~	2009-06-05 13:46:26.000000000 +0200
 @@ -0,0 +1,286 @@
 +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
 + * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -994,7 +1017,7 @@ diff -urNad lustre~/lustre/llite/llite_nfs.c~ lustre/lustre/llite/llite_nfs.c~
 +#endif
 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-05 12:14:34.000000000 +0200
++++ lustre/lustre/llite/lloop.c	2009-06-05 13:46:26.000000000 +0200
 @@ -347,7 +347,7 @@
          loop_add_bio(lo, old_bio);
          return 0;

-- 
Lustre Debian Packaging