[Pkg-lustre-svn-commit] r288 - in /trunk/debian: changelog patches/00list patches/lustre-intent-data-2.6.22-fix.dpatch

[pwinnertz-guest at users.alioth.debian.org]

Author: pwinnertz-guest
Date: Fri Sep  7 09:13:43 2007
New Revision: 288

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=288
Log:
fix redifinition of lustre_intent_data on 2.6.22

Added:
    trunk/debian/patches/lustre-intent-data-2.6.22-fix.dpatch
Modified:
    trunk/debian/changelog
    trunk/debian/patches/00list

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=288&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Fri Sep  7 09:13:43 2007
@@ -5,6 +5,7 @@
 
   [ Patrick Winnertz ]
   * Starting to modify patchset for kernel 2.6.21 for debian
+  * Modified patchset for lustre and ldiskfs for kernel 2.6.22
 
   [ Goswin von Brederlow ]
   * Fix -m64 problem causing FTBFS

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=288&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Fri Sep  7 09:13:43 2007
@@ -5,7 +5,7 @@
 #updated-2.6.18.dpatch
 libsysio.dpatch
 lustre_manpage.dpatch
-
+lustre-intent-data-2.6.22-fix.dpatch
 # QL patches
 
 #ql#open_intent.patch

Added: trunk/debian/patches/lustre-intent-data-2.6.22-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/lustre-intent-data-2.6.22-fix.dpatch?rev=288&op=file
==============================================================================
--- trunk/debian/patches/lustre-intent-data-2.6.22-fix.dpatch (added)
+++ trunk/debian/patches/lustre-intent-data-2.6.22-fix.dpatch Fri Sep  7 09:13:43 2007
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug10681.patch by Goswin von Brederlow <brederlo at informatik.uni-tuebingen.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP:Patch to prevent redefinition of lustre_intent_data on 2.6.22 
+
+ at DPATCH@
+--- ./lustre/include/linux/lustre_intent.h	2004-12-20 00:06:24.000000000 +0100
++++ ./lustre/include/linux/lustre_intent.h	2007-09-07 11:10:47.000000000 +0200
+@@ -2,6 +2,7 @@
+ #define LUSTRE_INTENT_H
+ 
+ #include <linux/lustre_version.h>
++#include <linux/version.h>
+ 
+ #ifndef HAVE_VFS_INTENT_PATCHES
+ #define IT_OPEN     (1)
+@@ -13,6 +14,7 @@
+ #define IT_TRUNC    (1<<6)
+ #define IT_GETXATTR (1<<7)
+ 
++#if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,22)
+ struct lustre_intent_data {
+         int       it_disposition;
+         int       it_status;
+@@ -20,6 +22,7 @@
+         void     *it_data;
+         int       it_lock_mode;
+ };
++#endif
+ 
+ struct lookup_intent {
+         int     it_op;