Author: winnie
Date: Wed Sep 17 19:21:05 2008
New Revision: 506

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=506
Log:
add some things to get 2.6.26 support

Modified:
    trunk/debian/changelog
    trunk/debian/patches/patchless_support_2.6.24.dpatch

Modified: trunk/debian/changelog
URL: 
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=506&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Wed Sep 17 19:21:05 2008
@@ -5,7 +5,7 @@
     (bug_15949_mds.body_capacity.dpatch)
   * Added patch from bugzilla to prevent kernel oops when 
     ost disk is ~70% full. - Doesn't work yet
-  * Add patch to support patchless clients with 2.6.24 kernel
+  * Add patch to support patchless clients with 2.6.24-2.6.26 kernels.
   * Added several patches from upstream bugzilla which fixes some errors.
     This are backports from patches applied to 1.6.6 or 1.6.7
   * Fix lintian warning about missing patch description in

Modified: trunk/debian/patches/patchless_support_2.6.24.dpatch
URL: 
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/patchless_support_2.6.24.dpatch?rev=506&op=diff
==============================================================================
--- trunk/debian/patches/patchless_support_2.6.24.dpatch (original)
+++ trunk/debian/patches/patchless_support_2.6.24.dpatch Wed Sep 17 19:21:05 
2008
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad trunk~/lnet/autoconf/lustre-lnet.m4 
trunk/lnet/autoconf/lustre-lnet.m4
 --- trunk~/lnet/autoconf/lustre-lnet.m4        2008-06-26 06:43:33.000000000 
+0200
-+++ trunk/lnet/autoconf/lustre-lnet.m4 2008-09-17 16:46:06.000000000 +0200
++++ trunk/lnet/autoconf/lustre-lnet.m4 2008-09-17 21:06:33.000000000 +0200
 @@ -1263,6 +1263,41 @@
  ])
  ])
@@ -62,7 +62,7 @@
  #
 diff -urNad trunk~/lnet/include/libcfs/curproc.h 
trunk/lnet/include/libcfs/curproc.h
 --- trunk~/lnet/include/libcfs/curproc.h       2007-02-10 01:04:30.000000000 
+0100
-+++ trunk/lnet/include/libcfs/curproc.h        2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lnet/include/libcfs/curproc.h        2008-09-17 21:06:33.000000000 
+0200
 @@ -49,6 +49,11 @@
   */
  cfs_kernel_cap_t cfs_curproc_cap_get(void);
@@ -77,7 +77,7 @@
  /* __LIBCFS_CURPROC_H__ */
 diff -urNad trunk~/lnet/include/libcfs/linux/linux-prim.h 
trunk/lnet/include/libcfs/linux/linux-prim.h
 --- trunk~/lnet/include/libcfs/linux/linux-prim.h      2008-01-14 
02:12:18.000000000 +0100
-+++ trunk/lnet/include/libcfs/linux/linux-prim.h       2008-09-17 
16:46:06.000000000 +0200
++++ trunk/lnet/include/libcfs/linux/linux-prim.h       2008-09-17 
21:06:33.000000000 +0200
 @@ -68,6 +68,17 @@
  #endif
  #define cfs_unregister_sysctl_table(t)        unregister_sysctl_table(t)
@@ -98,7 +98,7 @@
   */
 diff -urNad trunk~/lnet/klnds/gmlnd/gmlnd_module.c 
trunk/lnet/klnds/gmlnd/gmlnd_module.c
 --- trunk~/lnet/klnds/gmlnd/gmlnd_module.c     2007-09-27 04:30:24.000000000 
+0200
-+++ trunk/lnet/klnds/gmlnd/gmlnd_module.c      2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lnet/klnds/gmlnd/gmlnd_module.c      2008-09-17 21:06:33.000000000 
+0200
 @@ -62,9 +62,37 @@
  };
  
@@ -203,7 +203,7 @@
                  .maxlen   = 0,
 diff -urNad trunk~/lnet/klnds/iiblnd/iiblnd_modparams.c 
trunk/lnet/klnds/iiblnd/iiblnd_modparams.c
 --- trunk~/lnet/klnds/iiblnd/iiblnd_modparams.c        2007-09-10 
17:35:53.000000000 +0200
-+++ trunk/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-09-17 21:06:33.000000000 
+0200
 @@ -102,9 +102,50 @@
   * not to truncate the printout; it only needs to be the actual size of the
   * string buffer if we allow writes (and we don't) */
@@ -384,7 +384,7 @@
                  .maxlen   = 0,
 diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd.h 
trunk/lnet/klnds/o2iblnd/o2iblnd.h
 --- trunk~/lnet/klnds/o2iblnd/o2iblnd.h        2008-03-14 19:18:05.000000000 
+0100
-+++ trunk/lnet/klnds/o2iblnd/o2iblnd.h 2008-09-17 16:46:06.000000000 +0200
++++ trunk/lnet/klnds/o2iblnd/o2iblnd.h 2008-09-17 21:06:33.000000000 +0200
 @@ -759,3 +759,13 @@
  
  
@@ -401,7 +401,7 @@
 +#endif
 diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd_cb.c 
trunk/lnet/klnds/o2iblnd/o2iblnd_cb.c
 --- trunk~/lnet/klnds/o2iblnd/o2iblnd_cb.c     2008-03-28 08:12:34.000000000 
+0100
-+++ trunk/lnet/klnds/o2iblnd/o2iblnd_cb.c      2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lnet/klnds/o2iblnd/o2iblnd_cb.c      2008-09-17 21:06:33.000000000 
+0200
 @@ -626,9 +626,7 @@
                  fragnob = min((int)(iov->iov_len - offset), nob);
                  fragnob = min(fragnob, (int)PAGE_SIZE - page_offset);
@@ -430,7 +430,7 @@
                  nkiov--;
 diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd_modparams.c 
trunk/lnet/klnds/o2iblnd/o2iblnd_modparams.c
 --- trunk~/lnet/klnds/o2iblnd/o2iblnd_modparams.c      2007-09-10 
17:35:53.000000000 +0200
-+++ trunk/lnet/klnds/o2iblnd/o2iblnd_modparams.c       2008-09-17 
16:46:06.000000000 +0200
++++ trunk/lnet/klnds/o2iblnd/o2iblnd_modparams.c       2008-09-17 
21:06:33.000000000 +0200
 @@ -113,9 +113,51 @@
  
  static char ipif_basename_space[32];
@@ -621,7 +621,7 @@
                  .maxlen   = 0,
 diff -urNad trunk~/lnet/klnds/openiblnd/openiblnd_modparams.c 
trunk/lnet/klnds/openiblnd/openiblnd_modparams.c
 --- trunk~/lnet/klnds/openiblnd/openiblnd_modparams.c  2007-09-10 
17:35:54.000000000 +0200
-+++ trunk/lnet/klnds/openiblnd/openiblnd_modparams.c   2008-09-17 
16:46:06.000000000 +0200
++++ trunk/lnet/klnds/openiblnd/openiblnd_modparams.c   2008-09-17 
21:06:33.000000000 +0200
 @@ -83,9 +83,42 @@
  
  #if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -767,7 +767,7 @@
                  .maxlen   = 0,
 diff -urNad trunk~/lnet/klnds/ptllnd/ptllnd_modparams.c 
trunk/lnet/klnds/ptllnd/ptllnd_modparams.c
 --- trunk~/lnet/klnds/ptllnd/ptllnd_modparams.c        2007-09-27 
04:30:24.000000000 +0200
-+++ trunk/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-09-17 21:06:33.000000000 
+0200
 @@ -134,9 +134,54 @@
  }
  #endif
@@ -980,7 +980,7 @@
                  .maxlen   = 0,
 diff -urNad trunk~/lnet/klnds/qswlnd/qswlnd_modparams.c 
trunk/lnet/klnds/qswlnd/qswlnd_modparams.c
 --- trunk~/lnet/klnds/qswlnd/qswlnd_modparams.c        2007-09-10 
17:35:55.000000000 +0200
-+++ trunk/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-09-17 21:06:33.000000000 
+0200
 @@ -1,4 +1,7 @@
  /*
 + * -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
@@ -1137,7 +1137,7 @@
                  .maxlen   = 0,
 diff -urNad trunk~/lnet/klnds/ralnd/ralnd_modparams.c 
trunk/lnet/klnds/ralnd/ralnd_modparams.c
 --- trunk~/lnet/klnds/ralnd/ralnd_modparams.c  2007-08-02 10:30:12.000000000 
+0200
-+++ trunk/lnet/klnds/ralnd/ralnd_modparams.c   2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lnet/klnds/ralnd/ralnd_modparams.c   2008-09-17 21:06:33.000000000 
+0200
 @@ -72,9 +72,37 @@
  };
  
@@ -1260,7 +1260,7 @@
                  .maxlen   = 0,
 diff -urNad trunk~/lnet/klnds/socklnd/socklnd_lib-linux.c 
trunk/lnet/klnds/socklnd/socklnd_lib-linux.c
 --- trunk~/lnet/klnds/socklnd/socklnd_lib-linux.c      2007-09-11 
21:39:20.000000000 +0200
-+++ trunk/lnet/klnds/socklnd/socklnd_lib-linux.c       2008-09-17 
16:46:06.000000000 +0200
++++ trunk/lnet/klnds/socklnd/socklnd_lib-linux.c       2008-09-17 
21:06:33.000000000 +0200
 @@ -5,197 +5,244 @@
  #include "socklnd.h"
  
@@ -1587,7 +1587,7 @@
  
 diff -urNad trunk~/lnet/klnds/viblnd/viblnd_modparams.c 
trunk/lnet/klnds/viblnd/viblnd_modparams.c
 --- trunk~/lnet/klnds/viblnd/viblnd_modparams.c        2007-09-27 
04:30:24.000000000 +0200
-+++ trunk/lnet/klnds/viblnd/viblnd_modparams.c 2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lnet/klnds/viblnd/viblnd_modparams.c 2008-09-17 21:06:33.000000000 
+0200
 @@ -125,6 +125,56 @@
  #endif
  };
@@ -1827,18 +1827,18 @@
                  .maxlen   = 0,
 diff -urNad trunk~/lnet/libcfs/linux/linux-curproc.c 
trunk/lnet/libcfs/linux/linux-curproc.c
 --- trunk~/lnet/libcfs/linux/linux-curproc.c   2007-02-10 01:04:59.000000000 
+0100
-+++ trunk/lnet/libcfs/linux/linux-curproc.c    2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lnet/libcfs/linux/linux-curproc.c    2008-09-17 21:14:38.000000000 
+0200
 @@ -109,6 +109,19 @@
          current->cap_effective = cap;
  }
  
 +cfs_cap_t cfs_cap_convert_from_kernel(cfs_kernel_cap_t cap)
 +{
-+#if _LINUX_CAPABILITY_VERSION == 0x19980330
-+        return cap;
-+#elif _LINUX_CAPABILITY_VERSION == 0x20071026
++#if _LINUX_CAPABILITY_VERSION_3 || _LINUX_CAPABILITY_VERSION == 0x20071026
 +        /* XXX lost high byte */
 +        return cap.cap[0];
++#elif _LINUX_CAPABILITY_VERSION == 0x19980330
++        return cap;
 +#else
 +        #error "need correct _LINUX_CAPABILITY_VERSION "
 +#endif
@@ -1859,7 +1859,7 @@
   * c-indentation-style: "K&R"
 diff -urNad trunk~/lnet/libcfs/linux/linux-proc.c 
trunk/lnet/libcfs/linux/linux-proc.c
 --- trunk~/lnet/libcfs/linux/linux-proc.c      2008-03-25 13:23:25.000000000 
+0100
-+++ trunk/lnet/libcfs/linux/linux-proc.c       2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lnet/libcfs/linux/linux-proc.c       2008-09-17 21:06:33.000000000 
+0200
 @@ -61,7 +61,8 @@
  static cfs_sysctl_table_header_t *lnet_table_header = NULL;
  extern char lnet_upcall[1024];
@@ -2104,7 +2104,7 @@
  int insert_proc(void)
 diff -urNad trunk~/lnet/lnet/router_proc.c trunk/lnet/lnet/router_proc.c
 --- trunk~/lnet/lnet/router_proc.c     2007-11-29 14:35:39.000000000 +0100
-+++ trunk/lnet/lnet/router_proc.c      2008-09-17 16:46:06.000000000 +0200
++++ trunk/lnet/lnet/router_proc.c      2008-09-17 21:06:33.000000000 +0200
 @@ -32,12 +32,13 @@
  
  /* this is really lnet_proc.c */
@@ -2148,8 +2148,8 @@
  #else
 diff -urNad trunk~/lustre/autoconf/lustre-core.m4 
trunk/lustre/autoconf/lustre-core.m4
 --- trunk~/lustre/autoconf/lustre-core.m4      2008-06-26 05:05:21.000000000 
+0200
-+++ trunk/lustre/autoconf/lustre-core.m4       2008-09-17 16:46:38.000000000 
+0200
-@@ -1064,27 +1064,75 @@
++++ trunk/lustre/autoconf/lustre-core.m4       2008-09-17 21:06:33.000000000 
+0200
+@@ -1064,27 +1064,90 @@
  ])
  ])
  
@@ -2177,6 +2177,21 @@
 +              [ctl_table knows .parent])
 +],[
 +        AC_MSG_RESULT(NO)
++])
++])
++
++AC_DEFUN([IGET_CALL_IS_PRESENT],
++[AC_MSG_CHECKING([iget() call is available])
++LB_LINUX_TRY_COMPILE([
++      #include <linux/fs.h>
++],[
++      iget(NULL,0);
++],[
++      AC_MSG_RESULT(yes)
++      AC_DEFINE(HAVE_IGET_CALL, 1,
++        [iget call is available, which is removed in 2.6.26])
++],[
++      AC_MSG_RESULT(NO)
 +])
 +])
 +
@@ -2228,7 +2243,7 @@
  AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE],
  [LB_CHECK_SYMBOL_EXPORT([truncate_complete_page],
  [mm/truncate.c],[
-@@ -1230,11 +1278,156 @@
+@@ -1230,11 +1293,156 @@
  
  # 2.6.23 extract nfs export related data into exportfs.h
  AC_DEFUN([LC_HAVE_EXPORTFS_H],
@@ -2390,7 +2405,7 @@
  ])
  
  #
-@@ -1327,10 +1520,23 @@
+@@ -1327,10 +1535,24 @@
          
          # 2.6.22
            LC_INVALIDATE_BDEV_2ARG
@@ -2410,11 +2425,12 @@
 +          # 2.6.26
 +          LC_FS_STRUCT_USE_PATH
 +          LC_RCU_LIST_SAFE
-+        LC_PATH_RELEASE
++              LC_PATH_RELEASE
++          IGET_CALL_IS_PRESENT
  ])
  
  #
-@@ -1511,6 +1717,7 @@
+@@ -1511,6 +1733,7 @@
          ],[
                  AC_MSG_RESULT([no]) 
          ])
@@ -2424,7 +2440,7 @@
  ])
 diff -urNad trunk~/lustre/include/liblustre.h trunk/lustre/include/liblustre.h
 --- trunk~/lustre/include/liblustre.h  2008-04-24 09:07:44.000000000 +0200
-+++ trunk/lustre/include/liblustre.h   2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/include/liblustre.h   2008-09-17 21:06:33.000000000 +0200
 @@ -718,11 +718,13 @@
  struct _cap_struct;
  typedef struct _cap_struct *cap_t;
@@ -2476,7 +2492,7 @@
  
 diff -urNad trunk~/lustre/include/linux/lustre_compat25.h 
trunk/lustre/include/linux/lustre_compat25.h
 --- trunk~/lustre/include/linux/lustre_compat25.h      2008-03-27 
04:32:33.000000000 +0100
-+++ trunk/lustre/include/linux/lustre_compat25.h       2008-09-17 
16:46:06.000000000 +0200
++++ trunk/lustre/include/linux/lustre_compat25.h       2008-09-17 
21:06:33.000000000 +0200
 @@ -43,6 +43,28 @@
  #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */
  
@@ -2573,7 +2589,7 @@
  #endif /* _COMPAT25_H */
 diff -urNad trunk~/lustre/include/linux/lvfs.h 
trunk/lustre/include/linux/lvfs.h
 --- trunk~/lustre/include/linux/lvfs.h 2007-07-26 08:24:10.000000000 +0200
-+++ trunk/lustre/include/linux/lvfs.h  2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/include/linux/lvfs.h  2008-09-17 21:06:33.000000000 +0200
 @@ -47,7 +47,7 @@
          struct upcall_cache_entry *luc_uce;
          __u32 luc_fsuid;
@@ -2585,7 +2601,7 @@
          __u32 luc_umask;
 diff -urNad trunk~/lustre/include/lprocfs_status.h 
trunk/lustre/include/lprocfs_status.h
 --- trunk~/lustre/include/lprocfs_status.h     2008-04-18 06:47:52.000000000 
+0200
-+++ trunk/lustre/include/lprocfs_status.h      2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lustre/include/lprocfs_status.h      2008-09-17 21:06:33.000000000 
+0200
 @@ -481,6 +481,8 @@
  #define LPROCFS_EXIT()            do {  \
          up_read(&_lprocfs_lock);        \
@@ -2611,7 +2627,7 @@
   * the import in a client obd_device for a lprocfs entry */
 diff -urNad trunk~/lustre/include/lustre_log.h 
trunk/lustre/include/lustre_log.h
 --- trunk~/lustre/include/lustre_log.h 2007-08-24 13:12:48.000000000 +0200
-+++ trunk/lustre/include/lustre_log.h  2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/include/lustre_log.h  2008-09-17 21:06:33.000000000 +0200
 @@ -218,14 +218,6 @@
          void                    *llog_proc_cb;
  };
@@ -2674,7 +2690,7 @@
  
 diff -urNad trunk~/lustre/include/lustre_mds.h 
trunk/lustre/include/lustre_mds.h
 --- trunk~/lustre/include/lustre_mds.h 2008-04-24 06:41:00.000000000 +0200
-+++ trunk/lustre/include/lustre_mds.h  2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/include/lustre_mds.h  2008-09-17 21:06:33.000000000 +0200
 @@ -177,7 +177,7 @@
                   struct page *, struct ptlrpc_request **);
  int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
@@ -2685,8 +2701,8 @@
                 struct ptlrpc_request **request);
  int mdc_link(struct obd_export *exp, struct mdc_op_data *data,
 diff -urNad trunk~/lustre/llite/file.c trunk/lustre/llite/file.c
---- trunk~/lustre/llite/file.c 2008-09-17 16:46:05.000000000 +0200
-+++ trunk/lustre/llite/file.c  2008-09-17 16:46:06.000000000 +0200
+--- trunk~/lustre/llite/file.c 2008-09-17 21:06:32.000000000 +0200
++++ trunk/lustre/llite/file.c  2008-09-17 21:06:33.000000000 +0200
 @@ -1681,9 +1681,17 @@
  /*
   * Send file content (through pagecache) somewhere with helper
@@ -2820,7 +2836,7 @@
          .fsync          = ll_fsync,
 diff -urNad trunk~/lustre/llite/llite_internal.h 
trunk/lustre/llite/llite_internal.h
 --- trunk~/lustre/llite/llite_internal.h       2008-04-26 16:30:54.000000000 
+0200
-+++ trunk/lustre/llite/llite_internal.h        2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lustre/llite/llite_internal.h        2008-09-17 21:06:33.000000000 
+0200
 @@ -681,9 +681,6 @@
  /* llite/llite_nfs.c */
  extern struct export_operations lustre_export_operations;
@@ -2833,7 +2849,7 @@
  extern struct inode_operations ll_special_inode_operations;
 diff -urNad trunk~/lustre/llite/llite_lib.c trunk/lustre/llite/llite_lib.c
 --- trunk~/lustre/llite/llite_lib.c    2008-05-28 21:15:40.000000000 +0200
-+++ trunk/lustre/llite/llite_lib.c     2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/llite/llite_lib.c     2008-09-17 21:06:33.000000000 +0200
 @@ -1347,7 +1347,7 @@
                  rc = vmtruncate(inode, new_size);
                  clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -2845,7 +2861,7 @@
          }
 diff -urNad trunk~/lustre/llite/llite_mmap.c trunk/lustre/llite/llite_mmap.c
 --- trunk~/lustre/llite/llite_mmap.c   2008-03-27 04:32:37.000000000 +0100
-+++ trunk/lustre/llite/llite_mmap.c    2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/llite/llite_mmap.c    2008-09-17 21:06:33.000000000 +0200
 @@ -38,9 +38,6 @@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
@@ -3187,7 +3203,7 @@
  #endif
 diff -urNad trunk~/lustre/llite/llite_nfs.c trunk/lustre/llite/llite_nfs.c
 --- trunk~/lustre/llite/llite_nfs.c    2008-04-24 06:41:05.000000000 +0200
-+++ trunk/lustre/llite/llite_nfs.c     2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/llite/llite_nfs.c     2008-09-17 21:06:33.000000000 +0200
 @@ -40,11 +40,7 @@
          return (key0 << 1);
  }
@@ -3464,7 +3480,7 @@
 +};
 diff -urNad trunk~/lustre/llite/lloop.c trunk/lustre/llite/lloop.c
 --- trunk~/lustre/llite/lloop.c        2007-11-21 13:11:10.000000000 +0100
-+++ trunk/lustre/llite/lloop.c 2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/llite/lloop.c 2008-09-17 21:06:33.000000000 +0200
 @@ -299,7 +299,7 @@
          if (atomic_dec_and_test(&lo->lo_pending))
                  up(&lo->lo_bh_mutex);
@@ -3485,7 +3501,7 @@
  /*
 diff -urNad trunk~/lustre/llite/namei.c trunk/lustre/llite/namei.c
 --- trunk~/lustre/llite/namei.c        2008-04-24 06:41:06.000000000 +0200
-+++ trunk/lustre/llite/namei.c 2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/llite/namei.c 2008-09-17 21:06:33.000000000 +0200
 @@ -879,7 +879,7 @@
  
          err = mdc_create(sbi->ll_mdc_exp, &op_data, tgt, tgt_len,
@@ -3497,7 +3513,7 @@
  
 diff -urNad trunk~/lustre/llite/rw.c trunk/lustre/llite/rw.c
 --- trunk~/lustre/llite/rw.c   2008-04-03 05:23:43.000000000 +0200
-+++ trunk/lustre/llite/rw.c    2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/llite/rw.c    2008-09-17 21:06:33.000000000 +0200
 @@ -161,7 +161,7 @@
                  GOTO(out_unlock, 0);
          }
@@ -3509,7 +3525,7 @@
                  struct ost_lvb lvb;
 diff -urNad trunk~/lustre/llite/symlink.c trunk/lustre/llite/symlink.c
 --- trunk~/lustre/llite/symlink.c      2007-10-25 04:14:35.000000000 +0200
-+++ trunk/lustre/llite/symlink.c       2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/llite/symlink.c       2008-09-17 21:06:33.000000000 +0200
 @@ -156,8 +156,12 @@
          rc = ll_readlink_internal(inode, &request, &symname);
          up(&lli->lli_size_sem);
@@ -3525,7 +3541,7 @@
  
 diff -urNad trunk~/lustre/lvfs/lvfs_linux.c trunk/lustre/lvfs/lvfs_linux.c
 --- trunk~/lustre/lvfs/lvfs_linux.c    2007-10-30 06:25:57.000000000 +0100
-+++ trunk/lustre/lvfs/lvfs_linux.c     2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/lvfs/lvfs_linux.c     2008-09-17 21:06:33.000000000 +0200
 @@ -133,10 +133,10 @@
          */
  
@@ -3580,7 +3596,7 @@
  
 diff -urNad trunk~/lustre/mdc/mdc_internal.h trunk/lustre/mdc/mdc_internal.h
 --- trunk~/lustre/mdc/mdc_internal.h   2008-01-17 14:00:30.000000000 +0100
-+++ trunk/lustre/mdc/mdc_internal.h    2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/mdc/mdc_internal.h    2008-09-17 21:06:33.000000000 +0200
 @@ -28,7 +28,7 @@
                        void *ea2, int ea2len);
  void mdc_create_pack(struct ptlrpc_request *req, int offset,
@@ -3592,7 +3608,7 @@
                     struct mdc_op_data *op_data, __u32 mode, __u64 rdev,
 diff -urNad trunk~/lustre/mdc/mdc_lib.c trunk/lustre/mdc/mdc_lib.c
 --- trunk~/lustre/mdc/mdc_lib.c        2008-03-26 07:22:04.000000000 +0100
-+++ trunk/lustre/mdc/mdc_lib.c 2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/mdc/mdc_lib.c 2008-09-17 21:06:33.000000000 +0200
 @@ -46,7 +46,7 @@
          b = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*b));
          b->fsuid = current->fsuid;
@@ -3685,7 +3701,7 @@
          /* skip MDS_BFLAG_EXT_FLAGS to verify the "client < 1.4.7" case 
 diff -urNad trunk~/lustre/mdc/mdc_reint.c trunk/lustre/mdc/mdc_reint.c
 --- trunk~/lustre/mdc/mdc_reint.c      2008-02-18 13:43:18.000000000 +0100
-+++ trunk/lustre/mdc/mdc_reint.c       2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/mdc/mdc_reint.c       2008-09-17 21:06:33.000000000 +0200
 @@ -164,7 +164,7 @@
  
  int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
@@ -3697,7 +3713,7 @@
          struct obd_device *obd = exp->exp_obd;
 diff -urNad trunk~/lustre/mgc/mgc_request.c trunk/lustre/mgc/mgc_request.c
 --- trunk~/lustre/mgc/mgc_request.c    2008-04-24 13:54:15.000000000 +0200
-+++ trunk/lustre/mgc/mgc_request.c     2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/mgc/mgc_request.c     2008-09-17 21:06:33.000000000 +0200
 @@ -395,7 +395,7 @@
          obd->obd_lvfs_ctxt.fs = get_ds();
  
@@ -3709,7 +3725,7 @@
          if (IS_ERR(dentry)) {
 diff -urNad trunk~/lustre/obdclass/linux/linux-module.c 
trunk/lustre/obdclass/linux/linux-module.c
 --- trunk~/lustre/obdclass/linux/linux-module.c        2007-11-13 
21:43:24.000000000 +0100
-+++ trunk/lustre/obdclass/linux/linux-module.c 2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lustre/obdclass/linux/linux-module.c 2008-09-17 21:06:33.000000000 
+0200
 @@ -386,7 +386,7 @@
          ENTRY;
  
@@ -3721,7 +3737,7 @@
                         "LustreError: error registering /proc/fs/lustre\n");
 diff -urNad trunk~/lustre/obdclass/linux/linux-sysctl.c 
trunk/lustre/obdclass/linux/linux-sysctl.c
 --- trunk~/lustre/obdclass/linux/linux-sysctl.c        2008-03-25 
13:25:41.000000000 +0100
-+++ trunk/lustre/obdclass/linux/linux-sysctl.c 2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lustre/obdclass/linux/linux-sysctl.c 2008-09-17 21:06:33.000000000 
+0200
 @@ -48,7 +48,9 @@
  
  cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -4047,7 +4063,7 @@
  void obd_sysctl_init (void)
 diff -urNad trunk~/lustre/obdclass/llog_obd.c trunk/lustre/obdclass/llog_obd.c
 --- trunk~/lustre/obdclass/llog_obd.c  2007-12-24 21:15:32.000000000 +0100
-+++ trunk/lustre/obdclass/llog_obd.c   2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/obdclass/llog_obd.c   2008-09-17 21:06:33.000000000 +0200
 @@ -178,7 +178,7 @@
                  struct lov_stripe_md *lsm, struct llog_cookie *logcookies,
                  int numcookies)
@@ -4072,7 +4088,7 @@
  EXPORT_SYMBOL(llog_add);
 diff -urNad trunk~/lustre/obdclass/lprocfs_status.c 
trunk/lustre/obdclass/lprocfs_status.c
 --- trunk~/lustre/obdclass/lprocfs_status.c    2008-05-20 04:03:20.000000000 
+0200
-+++ trunk/lustre/obdclass/lprocfs_status.c     2008-09-17 16:46:06.000000000 
+0200
++++ trunk/lustre/obdclass/lprocfs_status.c     2008-09-17 21:06:33.000000000 
+0200
 @@ -117,6 +117,8 @@
          proc->read_proc = read_proc;
          proc->write_proc = write_proc;
@@ -4102,7 +4118,7 @@
          return rc;
 diff -urNad trunk~/lustre/ptlrpc/service.c trunk/lustre/ptlrpc/service.c
 --- trunk~/lustre/ptlrpc/service.c     2008-05-13 07:10:50.000000000 +0200
-+++ trunk/lustre/ptlrpc/service.c      2008-09-17 16:46:06.000000000 +0200
++++ trunk/lustre/ptlrpc/service.c      2008-09-17 21:06:33.000000000 +0200
 @@ -1244,7 +1244,7 @@
          cfs_daemonize(name);
          exit_fs(cfs_current());
@@ -4112,3 +4128,18 @@
  }
  
  static void
+diff -urNad trunk~/lustre/quota/quotacheck_test.c 
trunk/lustre/quota/quotacheck_test.c
+--- trunk~/lustre/quota/quotacheck_test.c      2008-01-03 07:31:16.000000000 
+0100
++++ trunk/lustre/quota/quotacheck_test.c       2008-09-17 21:06:33.000000000 
+0200
+@@ -70,7 +70,11 @@
+         if (ext3_test_bit(index, bitmap_bh->b_data)) {
+                 CERROR("i: %d, ino: %lu\n", index, ino);
+                 ll_sleep(1);
++#if HAVE_IGET_CALL
+                 inode = iget(sb, ino);
++#else
++                inode = iget_locked(sb, ino);
++#endif
+         }
+ 
+         return inode;


_______________________________________________
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

Reply via email to