[Pkg-lustre-svn-commit] updated: [30e3b61] Add patchless support for 2.6.27er kernel
Patrick Winnertz
winnie at debian.org
Fri Oct 10 11:24:49 UTC 2008
The following commit has been merged in the master branch:
commit 30e3b6151f2e57f9afb568bed7d22fe7d22d8f91
Author: Patrick Winnertz <winnie at debian.org>
Date: Fri Oct 10 13:23:18 2008 +0200
Add patchless support for 2.6.27er kernel
diff --git a/debian/patches/patchless_support_2.6.24.dpatch b/debian/patches/patchless_support_2.6.27.dpatch
similarity index 95%
copy from debian/patches/patchless_support_2.6.24.dpatch
copy to debian/patches/patchless_support_2.6.27.dpatch
index db522c9..76688e3 100755
--- a/debian/patches/patchless_support_2.6.24.dpatch
+++ b/debian/patches/patchless_support_2.6.27.dpatch
@@ -1,14 +1,15 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## posix_acl.patch by Patrick Winnertz <winnie at debian.org>
+## patchless_support_2.6.27.dpatch by Patrick Winnertz <winnie at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch which will enable 2.6.24 patchless support for lustre, taken from #14250
+## DP: Patch which will enable 2.6.24-2.6.27 patchless support for
+## DP: lustre, taken from #14250 and slightly modified for debian
@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-10-07 13:30:45.000000000 +0200
-@@ -1263,6 +1263,41 @@
++++ trunk/lnet/autoconf/lustre-lnet.m4 2008-09-18 23:45:47.000000000 +0200
+@@ -1263,6 +1263,55 @@
])
])
@@ -46,23 +47,39 @@ diff -urNad trunk~/lnet/autoconf/lustre-lnet.m4 trunk/lnet/autoconf/lustre-lnet.
+])
+])
+
++AC_DEFUN([LN_SOCKMAP_FD_EXTRA_FLAG],
++[AC_MSG_CHECKING([if sock_map_fd accepts flags])
++LB_LINUX_TRY_COMPILLE([
++ #include <linux/net.h>
++],[
++ sock_map_fd(NULL,0);
++],[
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_EXTRA_SOCKMAP_FD_FLAG, 1,
++ [sock_map_fd accepts two parameters])
++],[
++ AC_MSG_RESULT(NO)
++])
++])
+
#
# LN_PROG_LINUX
#
-@@ -1305,6 +1340,9 @@
+@@ -1305,6 +1354,11 @@
LN_KMEM_CACHE
# 2.6.23
LN_KMEM_CACHE_CREATE_DTOR
+# 2.6.24
+LN_SYSCTL_UNNUMBERED
+LN_SCATTERLIST_SETPAGE
++#2.6.27
++LN_SOCKMAP_FD_EXTRA_FLAG
])
#
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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/include/libcfs/curproc.h 2008-09-18 23:45:47.000000000 +0200
@@ -49,6 +49,11 @@
*/
cfs_kernel_cap_t cfs_curproc_cap_get(void);
@@ -77,7 +94,7 @@ diff -urNad trunk~/lnet/include/libcfs/curproc.h trunk/lnet/include/libcfs/curpr
/* __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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/include/libcfs/linux/linux-prim.h 2008-09-18 23:45:47.000000000 +0200
@@ -68,6 +68,17 @@
#endif
#define cfs_unregister_sysctl_table(t) unregister_sysctl_table(t)
@@ -98,7 +115,7 @@ diff -urNad trunk~/lnet/include/libcfs/linux/linux-prim.h trunk/lnet/include/lib
*/
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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/gmlnd/gmlnd_module.c 2008-09-18 23:45:47.000000000 +0200
@@ -62,9 +62,37 @@
};
@@ -203,7 +220,7 @@ diff -urNad trunk~/lnet/klnds/gmlnd/gmlnd_module.c trunk/lnet/klnds/gmlnd/gmlnd_
.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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-09-18 23:45:47.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 +401,7 @@ diff -urNad trunk~/lnet/klnds/iiblnd/iiblnd_modparams.c trunk/lnet/klnds/iiblnd/
.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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/o2iblnd/o2iblnd.h 2008-09-18 23:45:47.000000000 +0200
@@ -759,3 +759,13 @@
@@ -401,7 +418,7 @@ diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd.h trunk/lnet/klnds/o2iblnd/o2iblnd
+#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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-09-18 23:45:47.000000000 +0200
@@ -626,9 +626,7 @@
fragnob = min((int)(iov->iov_len - offset), nob);
fragnob = min(fragnob, (int)PAGE_SIZE - page_offset);
@@ -430,7 +447,7 @@ diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd_cb.c trunk/lnet/klnds/o2iblnd/o2ib
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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2008-09-18 23:45:47.000000000 +0200
@@ -113,9 +113,51 @@
static char ipif_basename_space[32];
@@ -621,7 +638,7 @@ diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd_modparams.c trunk/lnet/klnds/o2ibl
.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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/openiblnd/openiblnd_modparams.c 2008-09-18 23:45:47.000000000 +0200
@@ -83,9 +83,42 @@
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -767,7 +784,7 @@ diff -urNad trunk~/lnet/klnds/openiblnd/openiblnd_modparams.c trunk/lnet/klnds/o
.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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-09-18 23:45:47.000000000 +0200
@@ -134,9 +134,54 @@
}
#endif
@@ -980,7 +997,7 @@ diff -urNad trunk~/lnet/klnds/ptllnd/ptllnd_modparams.c trunk/lnet/klnds/ptllnd/
.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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-09-18 23:45:47.000000000 +0200
@@ -1,4 +1,7 @@
/*
+ * -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
@@ -1137,7 +1154,7 @@ diff -urNad trunk~/lnet/klnds/qswlnd/qswlnd_modparams.c trunk/lnet/klnds/qswlnd/
.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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/ralnd/ralnd_modparams.c 2008-09-18 23:45:47.000000000 +0200
@@ -72,9 +72,37 @@
};
@@ -1260,7 +1277,7 @@ diff -urNad trunk~/lnet/klnds/ralnd/ralnd_modparams.c trunk/lnet/klnds/ralnd/ral
.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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/socklnd/socklnd_lib-linux.c 2008-09-18 23:45:47.000000000 +0200
@@ -5,197 +5,244 @@
#include "socklnd.h"
@@ -1587,7 +1604,7 @@ diff -urNad trunk~/lnet/klnds/socklnd/socklnd_lib-linux.c trunk/lnet/klnds/sockl
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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/klnds/viblnd/viblnd_modparams.c 2008-09-18 23:45:47.000000000 +0200
@@ -125,6 +125,56 @@
#endif
};
@@ -1827,7 +1844,7 @@ diff -urNad trunk~/lnet/klnds/viblnd/viblnd_modparams.c trunk/lnet/klnds/viblnd/
.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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/libcfs/linux/linux-curproc.c 2008-09-18 23:45:47.000000000 +0200
@@ -109,6 +109,19 @@
current->cap_effective = cap;
}
@@ -1859,7 +1876,7 @@ diff -urNad trunk~/lnet/libcfs/linux/linux-curproc.c trunk/lnet/libcfs/linux/lin
* 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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/libcfs/linux/linux-proc.c 2008-09-18 23:45:47.000000000 +0200
@@ -61,7 +61,8 @@
static cfs_sysctl_table_header_t *lnet_table_header = NULL;
extern char lnet_upcall[1024];
@@ -2102,9 +2119,25 @@ diff -urNad trunk~/lnet/libcfs/linux/linux-proc.c trunk/lnet/libcfs/linux/linux-
};
int insert_proc(void)
+diff -urNad trunk~/lnet/libcfs/linux/linux-tcpip.c trunk/lnet/libcfs/linux/linux-tcpip.c
+--- trunk~/lnet/libcfs/linux/linux-tcpip.c 2007-09-06 07:23:17.000000000 +0200
++++ trunk/lnet/libcfs/linux/linux-tcpip.c 2008-09-18 23:45:47.000000000 +0200
+@@ -47,8 +47,11 @@
+ CERROR ("Can't create socket: %d\n", rc);
+ return rc;
+ }
+-
++#if HAVE_EXTRA_SOCKMAP_FD_FLAG
++ fd = sock_map_fd(sock, 0);
++#else
+ fd = sock_map_fd(sock);
++#endif
+ if (fd < 0) {
+ rc = fd;
+ sock_release(sock);
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-10-07 13:30:45.000000000 +0200
++++ trunk/lnet/lnet/router_proc.c 2008-09-18 23:45:47.000000000 +0200
@@ -32,12 +32,13 @@
/* this is really lnet_proc.c */
@@ -2148,7 +2181,7 @@ diff -urNad trunk~/lnet/lnet/router_proc.c trunk/lnet/lnet/router_proc.c
#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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/autoconf/lustre-core.m4 2008-09-18 23:52:50.000000000 +0200
@@ -1064,27 +1064,90 @@
])
])
@@ -2243,7 +2276,7 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4 trunk/lustre/autoconf/lustre-c
AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE],
[LB_CHECK_SYMBOL_EXPORT([truncate_complete_page],
[mm/truncate.c],[
-@@ -1230,11 +1293,156 @@
+@@ -1230,13 +1293,191 @@
# 2.6.23 extract nfs export related data into exportfs.h
AC_DEFUN([LC_HAVE_EXPORTFS_H],
@@ -2404,8 +2437,43 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4 trunk/lustre/autoconf/lustre-c
+])
])
++# asm/semaphore.h is deprecated on 2.6.27
++# include instead linux/semaphore.h
++AC_DEFUN([LC_ASM_SEMAPHORE_H],
++[AC_MSG_CHECKING([if asm/semaphore.h exists])
++LB_LINUX_TRY_COMPILE([
++ #include <asm/semaphore.h>
++],[
++ //do nothing here
++],[
++ AC_DEFINE(HAVE_ASM_SEMAPHORE_H, 1, [asm/semaphore.h exists])
++ AC_MSG_RESULT(yes)
++],[
++ AC_MSG_RESULT(NO)
++])
++])
++
++# request_queue_t is deleted in 2.6.27, use
++# instead the request_queue struct
++AC_DEFUN([LC_REQUEST_QUEUE_T],
++[AC_MSG_CHECKING([for request_queue_t])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/blkdev.h>
++],[
++ request_queue_t *test;
++],[
++ AC_DEFINE([HAVE_REQUEST_QUEUE_T, 1, [request_queue_t is available])
++ AC_MSG_RESULT(yes)
++],[
++ AC_MSG_RESULT(NO)
++])
++])
++
++
+ #
+ # LC_PROG_LINUX
#
-@@ -1327,10 +1535,24 @@
+@@ -1327,10 +1568,28 @@
# 2.6.22
LC_INVALIDATE_BDEV_2ARG
@@ -2427,10 +2495,14 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4 trunk/lustre/autoconf/lustre-c
+ LC_RCU_LIST_SAFE
+ LC_PATH_RELEASE
+ IGET_CALL_IS_PRESENT
++
++ #2.6.27
++ LC_ASM_SEMAPHORE_H
++ LC_REQUEST_QUEUE_T
])
#
-@@ -1511,6 +1733,7 @@
+@@ -1511,6 +1770,7 @@
],[
AC_MSG_RESULT([no])
])
@@ -2440,7 +2512,7 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4 trunk/lustre/autoconf/lustre-c
])
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/include/liblustre.h 2008-09-18 23:45:47.000000000 +0200
@@ -718,11 +718,13 @@
struct _cap_struct;
typedef struct _cap_struct *cap_t;
@@ -2492,7 +2564,7 @@ diff -urNad trunk~/lustre/include/liblustre.h trunk/lustre/include/liblustre.h
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/include/linux/lustre_compat25.h 2008-09-18 23:45:47.000000000 +0200
@@ -43,6 +43,28 @@
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */
@@ -2587,9 +2659,25 @@ diff -urNad trunk~/lustre/include/linux/lustre_compat25.h trunk/lustre/include/l
+
#endif /* __KERNEL__ */
#endif /* _COMPAT25_H */
+diff -urNad trunk~/lustre/include/linux/lustre_lib.h trunk/lustre/include/linux/lustre_lib.h
+--- trunk~/lustre/include/linux/lustre_lib.h 2007-09-13 04:24:44.000000000 +0200
++++ trunk/lustre/include/linux/lustre_lib.h 2008-09-18 23:45:47.000000000 +0200
+@@ -33,7 +33,11 @@
+ # include <string.h>
+ # include <sys/types.h>
+ #else
+-# include <asm/semaphore.h>
++# if HAVE_ASM_SEMAPHORE_H
++# include <asm/semaphore.h>
++# else
++# include <linux/semaphore.h>
++# endif
+ # include <linux/rwsem.h>
+ # include <linux/sched.h>
+ # include <linux/signal.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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/include/linux/lvfs.h 2008-09-18 23:45:47.000000000 +0200
@@ -47,7 +47,7 @@
struct upcall_cache_entry *luc_uce;
__u32 luc_fsuid;
@@ -2601,7 +2689,7 @@ diff -urNad trunk~/lustre/include/linux/lvfs.h trunk/lustre/include/linux/lvfs.h
__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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/include/lprocfs_status.h 2008-09-18 23:45:47.000000000 +0200
@@ -481,6 +481,8 @@
#define LPROCFS_EXIT() do { \
up_read(&_lprocfs_lock); \
@@ -2627,7 +2715,7 @@ diff -urNad trunk~/lustre/include/lprocfs_status.h trunk/lustre/include/lprocfs_
* 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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/include/lustre_log.h 2008-09-18 23:45:47.000000000 +0200
@@ -218,14 +218,6 @@
void *llog_proc_cb;
};
@@ -2690,7 +2778,7 @@ diff -urNad trunk~/lustre/include/lustre_log.h trunk/lustre/include/lustre_log.h
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/include/lustre_mds.h 2008-09-18 23:45:47.000000000 +0200
@@ -177,7 +177,7 @@
struct page *, struct ptlrpc_request **);
int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
@@ -2701,8 +2789,8 @@ diff -urNad trunk~/lustre/include/lustre_mds.h trunk/lustre/include/lustre_mds.h
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-10-07 13:30:45.000000000 +0200
-+++ trunk/lustre/llite/file.c 2008-10-07 13:30:45.000000000 +0200
+--- trunk~/lustre/llite/file.c 2008-09-18 23:45:46.000000000 +0200
++++ trunk/lustre/llite/file.c 2008-09-18 23:45:47.000000000 +0200
@@ -1681,9 +1681,17 @@
/*
* Send file content (through pagecache) somewhere with helper
@@ -2836,7 +2924,7 @@ diff -urNad trunk~/lustre/llite/file.c trunk/lustre/llite/file.c
.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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/llite/llite_internal.h 2008-09-18 23:45:47.000000000 +0200
@@ -681,9 +681,6 @@
/* llite/llite_nfs.c */
extern struct export_operations lustre_export_operations;
@@ -2849,7 +2937,7 @@ diff -urNad trunk~/lustre/llite/llite_internal.h trunk/lustre/llite/llite_intern
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/llite/llite_lib.c 2008-09-18 23:45:47.000000000 +0200
@@ -1347,7 +1347,7 @@
rc = vmtruncate(inode, new_size);
clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -2861,7 +2949,7 @@ diff -urNad trunk~/lustre/llite/llite_lib.c trunk/lustre/llite/llite_lib.c
}
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-10-07 13:32:03.000000000 +0200
++++ trunk/lustre/llite/llite_mmap.c 2008-09-18 23:45:47.000000000 +0200
@@ -38,9 +38,6 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -3203,7 +3291,7 @@ diff -urNad trunk~/lustre/llite/llite_mmap.c trunk/lustre/llite/llite_mmap.c
#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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/llite/llite_nfs.c 2008-09-18 23:45:47.000000000 +0200
@@ -40,11 +40,7 @@
return (key0 << 1);
}
@@ -3480,8 +3568,19 @@ diff -urNad trunk~/lustre/llite/llite_nfs.c trunk/lustre/llite/llite_nfs.c
+};
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-10-07 13:30:45.000000000 +0200
-@@ -299,7 +299,7 @@
++++ trunk/lustre/llite/lloop.c 2008-09-18 23:53:22.000000000 +0200
+@@ -108,6 +108,10 @@
+
+ #define LLOOP_MAX_SEGMENTS PTLRPC_MAX_BRW_PAGES
+
++#ifndef HAVE_REQUEST_QUEUE_T
++typedef struct request_queue request_queue_t
++#endif
++
+ /* Possible states of device */
+ enum {
+ LLOOP_UNBOUND,
+@@ -299,7 +303,7 @@
if (atomic_dec_and_test(&lo->lo_pending))
up(&lo->lo_bh_mutex);
out:
@@ -3490,7 +3589,7 @@ diff -urNad trunk~/lustre/llite/lloop.c trunk/lustre/llite/lloop.c
return 0;
inactive:
spin_unlock_irq(&lo->lo_lock);
-@@ -321,7 +321,7 @@
+@@ -321,7 +325,7 @@
{
int ret;
ret = do_bio_filebacked(lo, bio);
@@ -3501,7 +3600,7 @@ diff -urNad trunk~/lustre/llite/lloop.c trunk/lustre/llite/lloop.c
/*
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/llite/namei.c 2008-09-18 23:45:47.000000000 +0200
@@ -879,7 +879,7 @@
err = mdc_create(sbi->ll_mdc_exp, &op_data, tgt, tgt_len,
@@ -3513,7 +3612,7 @@ diff -urNad trunk~/lustre/llite/namei.c trunk/lustre/llite/namei.c
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/llite/rw.c 2008-09-18 23:45:47.000000000 +0200
@@ -161,7 +161,7 @@
GOTO(out_unlock, 0);
}
@@ -3525,7 +3624,7 @@ diff -urNad trunk~/lustre/llite/rw.c trunk/lustre/llite/rw.c
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/llite/symlink.c 2008-09-18 23:45:47.000000000 +0200
@@ -156,8 +156,12 @@
rc = ll_readlink_internal(inode, &request, &symname);
up(&lli->lli_size_sem);
@@ -3541,7 +3640,7 @@ diff -urNad trunk~/lustre/llite/symlink.c trunk/lustre/llite/symlink.c
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/lvfs/lvfs_linux.c 2008-09-18 23:45:47.000000000 +0200
@@ -133,10 +133,10 @@
*/
@@ -3596,7 +3695,7 @@ diff -urNad trunk~/lustre/lvfs/lvfs_linux.c trunk/lustre/lvfs/lvfs_linux.c
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/mdc/mdc_internal.h 2008-09-18 23:45:47.000000000 +0200
@@ -28,7 +28,7 @@
void *ea2, int ea2len);
void mdc_create_pack(struct ptlrpc_request *req, int offset,
@@ -3608,7 +3707,7 @@ diff -urNad trunk~/lustre/mdc/mdc_internal.h trunk/lustre/mdc/mdc_internal.h
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/mdc/mdc_lib.c 2008-09-18 23:45:47.000000000 +0200
@@ -46,7 +46,7 @@
b = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*b));
b->fsuid = current->fsuid;
@@ -3701,7 +3800,7 @@ diff -urNad trunk~/lustre/mdc/mdc_lib.c trunk/lustre/mdc/mdc_lib.c
/* 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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/mdc/mdc_reint.c 2008-09-18 23:45:47.000000000 +0200
@@ -164,7 +164,7 @@
int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
@@ -3713,7 +3812,7 @@ diff -urNad trunk~/lustre/mdc/mdc_reint.c trunk/lustre/mdc/mdc_reint.c
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/mgc/mgc_request.c 2008-09-18 23:45:47.000000000 +0200
@@ -395,7 +395,7 @@
obd->obd_lvfs_ctxt.fs = get_ds();
@@ -3725,7 +3824,7 @@ diff -urNad trunk~/lustre/mgc/mgc_request.c trunk/lustre/mgc/mgc_request.c
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/obdclass/linux/linux-module.c 2008-09-18 23:45:47.000000000 +0200
@@ -386,7 +386,7 @@
ENTRY;
@@ -3737,7 +3836,7 @@ diff -urNad trunk~/lustre/obdclass/linux/linux-module.c trunk/lustre/obdclass/li
"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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/obdclass/linux/linux-sysctl.c 2008-09-18 23:45:47.000000000 +0200
@@ -48,7 +48,9 @@
cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -4063,7 +4162,7 @@ diff -urNad trunk~/lustre/obdclass/linux/linux-sysctl.c trunk/lustre/obdclass/li
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/obdclass/llog_obd.c 2008-09-18 23:45:47.000000000 +0200
@@ -178,7 +178,7 @@
struct lov_stripe_md *lsm, struct llog_cookie *logcookies,
int numcookies)
@@ -4088,7 +4187,7 @@ diff -urNad trunk~/lustre/obdclass/llog_obd.c trunk/lustre/obdclass/llog_obd.c
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/obdclass/lprocfs_status.c 2008-09-18 23:45:47.000000000 +0200
@@ -117,6 +117,8 @@
proc->read_proc = read_proc;
proc->write_proc = write_proc;
@@ -4118,7 +4217,7 @@ diff -urNad trunk~/lustre/obdclass/lprocfs_status.c trunk/lustre/obdclass/lprocf
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/ptlrpc/service.c 2008-09-18 23:45:47.000000000 +0200
@@ -1244,7 +1244,7 @@
cfs_daemonize(name);
exit_fs(cfs_current());
@@ -4130,7 +4229,7 @@ diff -urNad trunk~/lustre/ptlrpc/service.c trunk/lustre/ptlrpc/service.c
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-10-07 13:30:45.000000000 +0200
++++ trunk/lustre/quota/quotacheck_test.c 2008-09-18 23:45:47.000000000 +0200
@@ -70,7 +70,14 @@
if (ext3_test_bit(index, bitmap_bh->b_data)) {
CERROR("i: %d, ino: %lu\n", index, ino);
--
Lustre Debian Packaging
More information about the Pkg-lustre-svn-commit
mailing list