[Pkg-lustre-svn-commit] updated: [3f69310] Fixed two compilation issues with patchless support for kernel >= 2.6.24
Patrick Winnertz
winnie at debian.org
Fri Mar 13 09:04:13 UTC 2009
The following commit has been merged in the master branch:
commit 3f693101e154eb2e7e12eafaf11512cc5a0d8575
Author: Patrick Winnertz <winnie at debian.org>
Date: Fri Mar 13 09:54:44 2009 +0100
Fixed two compilation issues with patchless support for kernel >= 2.6.24
1.) incompatible pointer type of tree_lock:
/usr/src/modules/lustre/lustre/include/linux/lustre_patchless_compat.h: In function
'll_remove_from_page_cache':
/usr/src/modules/lustre/lustre/include/linux/lustre_patchless_compat.h:58: warning:
passing argument 1 of '_spin_lock_irq' from incompatible pointer type
/usr/src/modules/lustre/lustre/include/linux/lustre_patchless_compat.h:71: warning:
passing argument 1 of '__raw_spin_unlock' from incompatible pointer type
Solution: Added configure check
2.) too many arguments to function bio_endio in lloop.c:337
/usr/src/modules/lustre/lustre/llite/lloop.c: In function ‘loop_handle_bio’:
/usr/src/modules/lustre/lustre/llite/lloop.c:337: error: too many arguments to function ‘bio_endio’
Solution: used cfs_bio_endio instead of bio_endio.
Signed-off-by: Patrick Winnertz <winnie at debian.org>
diff --git a/debian/patches/patchless_support_2.6.26.dpatch b/debian/patches/patchless_support_2.6.26.dpatch
index 2173bde..0d5c413 100755
--- a/debian/patches/patchless_support_2.6.26.dpatch
+++ b/debian/patches/patchless_support_2.6.26.dpatch
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lnet.m4
--- lustre~/lnet/autoconf/lustre-lnet.m4 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lnet/autoconf/lustre-lnet.m4 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lnet/autoconf/lustre-lnet.m4 2009-03-13 09:45:02.000000000 +0100
@@ -1362,6 +1362,22 @@
])
])
@@ -42,7 +42,7 @@ diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lne
#
diff -urNad lustre~/lnet/libcfs/linux/linux-prim.c lustre/lnet/libcfs/linux/linux-prim.c
--- lustre~/lnet/libcfs/linux/linux-prim.c 2008-08-07 11:51:06.000000000 +0200
-+++ lustre/lnet/libcfs/linux/linux-prim.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lnet/libcfs/linux/linux-prim.c 2009-03-13 09:45:02.000000000 +0100
@@ -49,7 +49,7 @@
void cfs_enter_debugger(void)
{
@@ -54,7 +54,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-prim.c lustre/lnet/libcfs/linux/linu
#else
diff -urNad lustre~/lnet/libcfs/linux/linux-tcpip.c lustre/lnet/libcfs/linux/linux-tcpip.c
--- lustre~/lnet/libcfs/linux/linux-tcpip.c 2008-08-07 11:51:07.000000000 +0200
-+++ lustre/lnet/libcfs/linux/linux-tcpip.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lnet/libcfs/linux/linux-tcpip.c 2009-03-13 09:45:02.000000000 +0100
@@ -63,7 +63,11 @@
return rc;
}
@@ -69,7 +69,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-tcpip.c lustre/lnet/libcfs/linux/lin
sock_release(sock);
diff -urNad lustre~/lnet/lnet/api-ni.c lustre/lnet/lnet/api-ni.c
--- lustre~/lnet/lnet/api-ni.c 2009-03-12 10:21:27.000000000 +0100
-+++ lustre/lnet/lnet/api-ni.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lnet/lnet/api-ni.c 2009-03-13 09:45:02.000000000 +0100
@@ -1032,7 +1032,7 @@
#ifdef __KERNEL__
if (lnd == NULL) {
@@ -81,7 +81,7 @@ diff -urNad lustre~/lnet/lnet/api-ni.c lustre/lnet/lnet/api-ni.c
lnd = lnet_find_lnd_by_type(lnd_type);
diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
--- lustre~/lustre/autoconf/lustre-core.m4 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/autoconf/lustre-core.m4 2009-03-12 11:07:59.000000000 +0100
++++ lustre/lustre/autoconf/lustre-core.m4 2009-03-13 09:45:02.000000000 +0100
@@ -1106,15 +1106,20 @@
AC_DEFUN([LC_PAGE_CHECKED],
[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
@@ -147,7 +147,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
AC_DEFUN([LC_KERNEL_SPLICE_READ],
[AC_MSG_CHECKING([if kernel has .splice_read])
LB_LINUX_TRY_COMPILE([
-@@ -1268,11 +1295,219 @@
+@@ -1268,11 +1295,240 @@
# 2.6.23 extract nfs export related data into exportfs.h
AC_DEFUN([LC_HAVE_EXPORTFS_H],
@@ -369,10 +369,31 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
+],[
+ AC_MSG_RESULT([no])
+])
++])
++
++# 2.6.27 and some older have mapping->tree_lock as spin_lock
++AC_DEFUN([LC_RW_TREE_LOCK],
++[AC_MSG_CHECKING([mapping->tree_lock is rw_lock])
++tmp_flags="$EXTRA_KCFLAGS"
++EXTRA_KCFLAGS="-Werror"
++LB_LINUX_TRY_COMPILE([
++ #include <linux/fs.h>
++],[
++ struct address_space *map = NULL;
++
++ write_lock_irq(&map->tree_lock);
++],[
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_RW_TREE_LOCK, 1,
++ [mapping->tree_lock is rw_lock])
++],[
++ AC_MSG_RESULT(no)
++])
++EXTRA_KCFLAGS="$tmp_flags"
])
#
-@@ -1372,8 +1607,30 @@
+@@ -1372,8 +1628,31 @@
LC_FS_RENAME_DOES_D_MOVE
# 2.6.23
LC_UNREGISTER_BLKDEV_RETURN_INT
@@ -400,10 +421,11 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
+ LC_INODE_PERMISION_2ARGS
+ LC_FILE_REMOVE_SUID
+ LC_TRYLOCKPAGE
++ LC_RW_TREE_LOCK
])
#
-@@ -1606,6 +1863,7 @@
+@@ -1606,6 +1885,7 @@
],[
AC_MSG_RESULT([no])
])
@@ -413,8 +435,8 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
])
diff -urNad lustre~/lustre/autoconf/lustre-core.m4.orig lustre/lustre/autoconf/lustre-core.m4.orig
--- lustre~/lustre/autoconf/lustre-core.m4.orig 1970-01-01 00:00:00.000000000 +0000
-+++ lustre/lustre/autoconf/lustre-core.m4.orig 2009-03-12 10:32:27.000000000 +0100
-@@ -0,0 +1,1817 @@
++++ lustre/lustre/autoconf/lustre-core.m4.orig 2009-03-13 09:45:02.000000000 +0100
+@@ -0,0 +1,2075 @@
+#* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+#* vim:expandtab:shiftwidth=8:tabstop=8:
+#
@@ -1523,15 +1545,20 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4.orig lustre/lustre/autoconf/l
+AC_DEFUN([LC_PAGE_CHECKED],
+[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
+LB_LINUX_TRY_COMPILE([
-+ #include <linux/mm.h>
-+ #include <linux/page-flags.h>
++ #include <linux/autoconf.h>
++#ifdef HAVE_LINUX_MMTYPES_H
++ #include <linux/mm_types.h>
++#endif
++ #include <linux/page-flags.h>
+],[
-+ #ifndef PageChecked
-+ #error PageChecked not defined in kernel
-+ #endif
-+ #ifndef SetPageChecked
-+ #error SetPageChecked not defined in kernel
-+ #endif
++ struct page *p;
++
++ /* before 2.6.26 this define*/
++ #ifndef PageChecked
++ /* 2.6.26 use function instead of define for it */
++ SetPageChecked(p);
++ PageChecked(p);
++ #endif
+],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_PAGE_CHECKED, 1,
@@ -1649,6 +1676,9 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4.orig lustre/lustre/autoconf/l
+])
+])
+
++# 2.6.18
++
++
+# 2.6.23 have return type 'void' for unregister_blkdev
+AC_DEFUN([LC_UNREGISTER_BLKDEV_RETURN_INT],
+[AC_MSG_CHECKING([if unregister_blkdev return int])
@@ -1666,6 +1696,25 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4.orig lustre/lustre/autoconf/l
+])
+
+# 2.6.23 change .sendfile to .splice_read
++# RHEL4 (-92 kernel) have both sendfile and .splice_read API
++AC_DEFUN([LC_KERNEL_SENDFILE],
++[AC_MSG_CHECKING([if kernel has .sendfile])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/fs.h>
++],[
++ struct file_operations file;
++
++ file.sendfile = NULL;
++], [
++ AC_MSG_RESULT([yes])
++ AC_DEFINE(HAVE_KERNEL_SENDFILE, 1,
++ [kernel has .sendfile])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++# 2.6.23 change .sendfile to .splice_read
+AC_DEFUN([LC_KERNEL_SPLICE_READ],
+[AC_MSG_CHECKING([if kernel has .splice_read])
+LB_LINUX_TRY_COMPILE([
@@ -1685,11 +1734,219 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4.orig lustre/lustre/autoconf/l
+
+# 2.6.23 extract nfs export related data into exportfs.h
+AC_DEFUN([LC_HAVE_EXPORTFS_H],
-+[
-+tmpfl="$CFLAGS"
-+CFLAGS="$CFLAGS -I$LINUX_OBJ/include"
-+AC_CHECK_HEADERS([linux/exportfs.h])
-+CFLAGS="$tmpfl"
++[LB_CHECK_FILE([$LINUX/include/linux/exportfs.h], [
++ AC_DEFINE(HAVE_LINUX_EXPORTFS_H, 1,
++ [kernel has include/exportfs.h])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++# 2.6.23 have new page fault handling API
++AC_DEFUN([LC_VM_OP_FAULT],
++[AC_MSG_CHECKING([if kernel has .fault in vm_operation_struct])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/mm.h>
++],[
++ struct vm_operations_struct op;
++
++ op.fault = NULL;
++], [
++ AC_MSG_RESULT([yes])
++ AC_DEFINE(HAVE_VM_OP_FAULT, 1,
++ [if kernel has .fault in vm_operation_struct])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++#2.6.23 has new shrinker API
++AC_DEFUN([LC_REGISTER_SHRINKER],
++[AC_MSG_CHECKING([if kernel has register_shrinker])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/mm.h>
++],[
++ register_shrinker(NULL);
++], [
++ AC_MSG_RESULT([yes])
++ AC_DEFINE(HAVE_REGISTER_SHRINKER, 1,
++ [if kernel has register_shrinker])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++# 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])
++])
++])
++
++# 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])
++])
++])
++
++# 2.6.24 need linux/mm_types.h included
++AC_DEFUN([LC_HAVE_MMTYPES_H],
++[LB_CHECK_FILE([$LINUX/include/linux/mm_types.h], [
++ AC_DEFINE(HAVE_LINUX_MMTYPES_H, 1,
++ [kernel has include/mm_types.h])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++# 2.6.24 remove long aged procfs entry -> deleted member
++AC_DEFUN([LC_PROCFS_DELETED],
++[AC_MSG_CHECKING([if kernel has deleted member in procfs entry struct])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/proc_fs.h>
++],[
++ struct proc_dir_entry pde;
++
++ pde.deleted = NULL;
++], [
++ AC_MSG_RESULT([yes])
++ AC_DEFINE(HAVE_PROCFS_DELETED, 1,
++ [kernel has deleted member in procfs entry struct])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++# 2.6.25 change define to inline
++AC_DEFUN([LC_MAPPING_CAP_WRITEBACK_DIRTY],
++[AC_MSG_CHECKING([if kernel have mapping_cap_writeback_dirty])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/backing-dev.h>
++],[
++ #ifndef mapping_cap_writeback_dirty
++ mapping_cap_writeback_dirty(NULL);
++ #endif
++],[
++ AC_MSG_RESULT([yes])
++ AC_DEFINE(HAVE_MAPPING_CAP_WRITEBACK_DIRTY, 1,
++ [kernel have mapping_cap_writeback_dirty])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++
++
++# 2.6.26 isn't export set_fs_pwd and change paramter in fs struct
++AC_DEFUN([LC_FS_STRUCT_USE_PATH],
++[AC_MSG_CHECKING([fs_struct use path structure])
++LB_LINUX_TRY_COMPILE([
++ #include <asm/atomic.h>
++ #include <linux/spinlock.h>
++ #include <linux/fs_struct.h>
++],[
++ struct path path;
++ struct fs_struct fs;
++
++ fs.pwd = path;
++], [
++ AC_MSG_RESULT([yes])
++ AC_DEFINE(HAVE_FS_STRUCT_USE_PATH, 1,
++ [fs_struct use path structure])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++# 2.6.26 remove path_release and use path_put instead
++AC_DEFUN([LC_PATH_RELEASE],
++[AC_MSG_CHECKING([if path_release exist])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/dcache.h>
++ #include <linux/namei.h>
++],[
++ path_release(NULL);
++],[
++ AC_DEFINE(HAVE_PATH_RELEASE, 1, [path_release exist])
++ AC_MSG_RESULT([yes])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++#2.6.27
++AC_DEFUN([LC_INODE_PERMISION_2ARGS],
++[AC_MSG_CHECKING([inode_operations->permission have two args])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/fs.h>
++],[
++ struct inode *inode;
++
++ inode->i_op->permission(NULL,0);
++],[
++ AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1,
++ [inode_operations->permission have two args])
++ AC_MSG_RESULT([yes])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++# 2.6.27 have file_remove_suid instead of remove_suid
++AC_DEFUN([LC_FILE_REMOVE_SUID],
++[AC_MSG_CHECKING([kernel have file_remove_suid])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/fs.h>
++],[
++ file_remove_suid(NULL);
++],[
++ AC_DEFINE(HAVE_FILE_REMOVE_SUID, 1,
++ [kernel have file_remove_suid])
++ AC_MSG_RESULT([yes])
++],[
++ AC_MSG_RESULT([no])
++])
++])
++
++# 2.6.27 have new page locking API
++AC_DEFUN([LC_TRYLOCKPAGE],
++[AC_MSG_CHECKING([kernel use trylock_page for page lock])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/pagemap.h>
++],[
++ trylock_page(NULL);
++],[
++ AC_DEFINE(HAVE_TRYLOCK_PAGE, 1,
++ [kernel use trylock_page for page lock])
++ AC_MSG_RESULT([yes])
++],[
++ AC_MSG_RESULT([no])
++])
+])
+
+#
@@ -1789,8 +2046,30 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4.orig lustre/lustre/autoconf/l
+ LC_FS_RENAME_DOES_D_MOVE
+ # 2.6.23
+ LC_UNREGISTER_BLKDEV_RETURN_INT
++ LC_KERNEL_SENDFILE
+ LC_KERNEL_SPLICE_READ
+ LC_HAVE_EXPORTFS_H
++ LC_VM_OP_FAULT
++ LC_REGISTER_SHRINKER
++
++ #2.6.25
++ LC_MAPPING_CAP_WRITEBACK_DIRTY
++
++ # 2.6.24
++ LC_HAVE_MMTYPES_H
++ LC_BIO_ENDIO_2ARG
++ LC_FH_TO_DENTRY
++ LC_PROCFS_DELETED
++
++ # 2.6.26
++ LC_FS_STRUCT_USE_PATH
++ LC_RCU_LIST_SAFE
++ LC_PATH_RELEASE
++
++ # 2.6.27
++ LC_INODE_PERMISION_2ARGS
++ LC_FILE_REMOVE_SUID
++ LC_TRYLOCKPAGE
+])
+
+#
@@ -2023,6 +2302,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4.orig lustre/lustre/autoconf/l
+ ],[
+ AC_MSG_RESULT([no])
+ ])
++
+],[
+ AC_MSG_RESULT([no])
+])
@@ -2234,7 +2514,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4.orig lustre/lustre/autoconf/l
+])
diff -urNad lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include/linux/lustre_compat25.h
--- lustre~/lustre/include/linux/lustre_compat25.h 2009-03-12 10:33:45.000000000 +0100
-+++ lustre/lustre/include/linux/lustre_compat25.h 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/include/linux/lustre_compat25.h 2009-03-13 09:45:02.000000000 +0100
@@ -57,6 +57,28 @@
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */
@@ -2372,7 +2652,7 @@ diff -urNad lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include
{
diff -urNad lustre~/lustre/include/linux/lustre_compat25.h.orig lustre/lustre/include/linux/lustre_compat25.h.orig
--- lustre~/lustre/include/linux/lustre_compat25.h.orig 1970-01-01 00:00:00.000000000 +0000
-+++ lustre/lustre/include/linux/lustre_compat25.h.orig 2009-03-12 10:33:45.000000000 +0100
++++ lustre/lustre/include/linux/lustre_compat25.h.orig 2009-03-13 09:45:03.000000000 +0100
@@ -0,0 +1,411 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -2787,7 +3067,7 @@ diff -urNad lustre~/lustre/include/linux/lustre_compat25.h.orig lustre/lustre/in
+#endif /* _COMPAT25_H */
diff -urNad lustre~/lustre/include/linux/lustre_lib.h lustre/lustre/include/linux/lustre_lib.h
--- lustre~/lustre/include/linux/lustre_lib.h 2008-08-07 11:52:06.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_lib.h 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/include/linux/lustre_lib.h 2009-03-13 09:45:03.000000000 +0100
@@ -49,7 +49,6 @@
# include <string.h>
# include <sys/types.h>
@@ -2798,7 +3078,7 @@ diff -urNad lustre~/lustre/include/linux/lustre_lib.h lustre/lustre/include/linu
# include <linux/signal.h>
diff -urNad lustre~/lustre/include/linux/lustre_patchless_compat.h lustre/lustre/include/linux/lustre_patchless_compat.h
--- lustre~/lustre/include/linux/lustre_patchless_compat.h 2008-08-07 11:52:10.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_patchless_compat.h 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/include/linux/lustre_patchless_compat.h 2009-03-13 09:45:03.000000000 +0100
@@ -52,7 +52,7 @@
BUG_ON(!PageLocked(page));
@@ -2819,7 +3099,7 @@ diff -urNad lustre~/lustre/include/linux/lustre_patchless_compat.h lustre/lustre
spin_unlock_irq(&mapping->tree_lock);
diff -urNad lustre~/lustre/include/lprocfs_status.h lustre/lustre/include/lprocfs_status.h
--- lustre~/lustre/include/lprocfs_status.h 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/include/lprocfs_status.h 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/include/lprocfs_status.h 2009-03-13 09:45:03.000000000 +0100
@@ -521,6 +521,8 @@
#define LPROCFS_EXIT() do { \
up_read(&_lprocfs_lock); \
@@ -2854,7 +3134,7 @@ diff -urNad lustre~/lustre/include/lprocfs_status.h lustre/lustre/include/lprocf
#define LPROCFS_CLIMP_CHECK(obd) do { \
diff -urNad lustre~/lustre/include/lprocfs_status.h.orig lustre/lustre/include/lprocfs_status.h.orig
--- lustre~/lustre/include/lprocfs_status.h.orig 1970-01-01 00:00:00.000000000 +0000
-+++ lustre/lustre/include/lprocfs_status.h.orig 2009-03-12 10:32:27.000000000 +0100
++++ lustre/lustre/include/lprocfs_status.h.orig 2009-03-13 09:45:03.000000000 +0100
@@ -0,0 +1,817 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -3674,8 +3954,8 @@ diff -urNad lustre~/lustre/include/lprocfs_status.h.orig lustre/lustre/include/l
+
+#endif /* LPROCFS_SNMP_H */
diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
---- lustre~/lustre/llite/file.c 2009-03-12 11:02:39.000000000 +0100
-+++ lustre/lustre/llite/file.c 2009-03-12 11:02:51.000000000 +0100
+--- lustre~/lustre/llite/file.c 2009-03-13 09:45:02.000000000 +0100
++++ lustre/lustre/llite/file.c 2009-03-13 09:45:03.000000000 +0100
@@ -1801,11 +1801,12 @@
#endif
}
@@ -3908,7 +4188,7 @@ diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
.flock = ll_file_noflock,
diff -urNad lustre~/lustre/llite/file.c.orig lustre/lustre/llite/file.c.orig
--- lustre~/lustre/llite/file.c.orig 1970-01-01 00:00:00.000000000 +0000
-+++ lustre/lustre/llite/file.c.orig 2009-03-12 11:02:39.000000000 +0100
++++ lustre/lustre/llite/file.c.orig 2009-03-13 09:45:03.000000000 +0100
@@ -0,0 +1,3335 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -7247,7 +7527,7 @@ diff -urNad lustre~/lustre/llite/file.c.orig lustre/lustre/llite/file.c.orig
+}
diff -urNad lustre~/lustre/llite/llite_internal.h lustre/lustre/llite/llite_internal.h
--- lustre~/lustre/llite/llite_internal.h 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/llite/llite_internal.h 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/llite/llite_internal.h 2009-03-13 09:45:03.000000000 +0100
@@ -647,7 +647,7 @@
struct lookup_intent *it, struct kstat *stat);
int ll_getattr(struct vfsmount *mnt, struct dentry *de, struct kstat *stat);
@@ -7269,7 +7549,7 @@ diff -urNad lustre~/lustre/llite/llite_internal.h lustre/lustre/llite/llite_inte
extern struct inode_operations ll_special_inode_operations;
diff -urNad lustre~/lustre/llite/llite_internal.h.orig lustre/lustre/llite/llite_internal.h.orig
--- lustre~/lustre/llite/llite_internal.h.orig 1970-01-01 00:00:00.000000000 +0000
-+++ lustre/lustre/llite/llite_internal.h.orig 2009-03-12 10:32:27.000000000 +0100
++++ lustre/lustre/llite/llite_internal.h.orig 2009-03-13 09:45:03.000000000 +0100
@@ -0,0 +1,1027 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -8300,7 +8580,7 @@ diff -urNad lustre~/lustre/llite/llite_internal.h.orig lustre/lustre/llite/llite
+#endif /* LLITE_INTERNAL_H */
diff -urNad lustre~/lustre/llite/llite_lib.c lustre/lustre/llite/llite_lib.c
--- lustre~/lustre/llite/llite_lib.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/llite/llite_lib.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/llite/llite_lib.c 2009-03-13 09:45:03.000000000 +0100
@@ -1346,7 +1346,7 @@
rc = vmtruncate(inode, new_size);
clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -8312,7 +8592,7 @@ diff -urNad lustre~/lustre/llite/llite_lib.c lustre/lustre/llite/llite_lib.c
}
diff -urNad lustre~/lustre/llite/llite_lib.c.orig lustre/lustre/llite/llite_lib.c.orig
--- lustre~/lustre/llite/llite_lib.c.orig 1970-01-01 00:00:00.000000000 +0000
-+++ lustre/lustre/llite/llite_lib.c.orig 2009-03-12 10:32:27.000000000 +0100
++++ lustre/lustre/llite/llite_lib.c.orig 2009-03-13 09:45:03.000000000 +0100
@@ -0,0 +1,2232 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -10548,7 +10828,7 @@ diff -urNad lustre~/lustre/llite/llite_lib.c.orig lustre/lustre/llite/llite_lib.
+}
diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c
--- lustre~/lustre/llite/llite_mmap.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/llite/llite_mmap.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/llite/llite_mmap.c 2009-03-13 09:45:03.000000000 +0100
@@ -81,8 +81,7 @@
int lt_get_mmap_locks(struct ll_lock_tree *tree,
unsigned long addr, size_t count);
@@ -10848,7 +11128,7 @@ diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c
#endif
diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c
--- lustre~/lustre/llite/llite_nfs.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/llite/llite_nfs.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/llite/llite_nfs.c 2009-03-13 09:45:03.000000000 +0100
@@ -68,36 +68,30 @@
}
@@ -11132,7 +11412,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-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/llite/lloop.c 2009-03-12 11:04:30.000000000 +0100
++++ lustre/lustre/llite/lloop.c 2009-03-13 09:45:45.000000000 +0100
@@ -152,7 +152,7 @@
struct semaphore lo_bh_mutex;
atomic_t lo_pending;
@@ -11169,6 +11449,15 @@ diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c
{
struct lloop_device *lo = q->queuedata;
+@@ -334,7 +334,7 @@
+ {
+ int ret;
+ ret = do_bio_filebacked(lo, bio);
+- bio_endio(bio, bio->bi_size, ret);
++ cfs_bio_endio(bio, bio->bi_size, ret);
+ }
+
+ /*
@@ -736,7 +736,7 @@
out_mem4:
@@ -11189,7 +11478,7 @@ diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c
if (ll_unregister_blkdev(lloop_major, "lloop"))
diff -urNad lustre~/lustre/llite/lloop.c.orig lustre/lustre/llite/lloop.c.orig
--- lustre~/lustre/llite/lloop.c.orig 1970-01-01 00:00:00.000000000 +0000
-+++ lustre/lustre/llite/lloop.c.orig 2009-03-12 10:32:27.000000000 +0100
++++ lustre/lustre/llite/lloop.c.orig 2009-03-13 09:45:03.000000000 +0100
@@ -0,0 +1,777 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -11970,7 +12259,7 @@ diff -urNad lustre~/lustre/llite/lloop.c.orig lustre/lustre/llite/lloop.c.orig
+MODULE_LICENSE("GPL");
diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c
--- lustre~/lustre/llite/rw.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/llite/rw.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/llite/rw.c 2009-03-13 09:45:03.000000000 +0100
@@ -61,6 +61,8 @@
#define DEBUG_SUBSYSTEM S_LLITE
@@ -12000,7 +12289,7 @@ diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c
}
diff -urNad lustre~/lustre/llite/rw.c.orig lustre/lustre/llite/rw.c.orig
--- lustre~/lustre/llite/rw.c.orig 1970-01-01 00:00:00.000000000 +0000
-+++ lustre/lustre/llite/rw.c.orig 2009-03-12 10:32:27.000000000 +0100
++++ lustre/lustre/llite/rw.c.orig 2009-03-13 09:45:03.000000000 +0100
@@ -0,0 +1,2215 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -14219,7 +14508,7 @@ diff -urNad lustre~/lustre/llite/rw.c.orig lustre/lustre/llite/rw.c.orig
+}
diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c
--- lustre~/lustre/llite/symlink.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/llite/symlink.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/llite/symlink.c 2009-03-13 09:45:03.000000000 +0100
@@ -177,8 +177,12 @@
up(&lli->lli_size_sem);
}
@@ -14235,7 +14524,7 @@ diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c
diff -urNad lustre~/lustre/lvfs/lvfs_linux.c lustre/lustre/lvfs/lvfs_linux.c
--- lustre~/lustre/lvfs/lvfs_linux.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/lvfs/lvfs_linux.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/lvfs/lvfs_linux.c 2009-03-13 09:45:03.000000000 +0100
@@ -148,10 +148,10 @@
*/
@@ -14267,7 +14556,7 @@ diff -urNad lustre~/lustre/lvfs/lvfs_linux.c lustre/lustre/lvfs/lvfs_linux.c
ll_set_fs_pwd(current->fs, saved->pwdmnt, saved->pwd);
diff -urNad lustre~/lustre/mgc/mgc_request.c lustre/lustre/mgc/mgc_request.c
--- lustre~/lustre/mgc/mgc_request.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/mgc/mgc_request.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/mgc/mgc_request.c 2009-03-13 09:45:03.000000000 +0100
@@ -415,7 +415,7 @@
obd->obd_lvfs_ctxt.fs = get_ds();
@@ -14279,7 +14568,7 @@ diff -urNad lustre~/lustre/mgc/mgc_request.c lustre/lustre/mgc/mgc_request.c
if (IS_ERR(dentry)) {
diff -urNad lustre~/lustre/obdclass/linux/linux-module.c lustre/lustre/obdclass/linux/linux-module.c
--- lustre~/lustre/obdclass/linux/linux-module.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/obdclass/linux/linux-module.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/obdclass/linux/linux-module.c 2009-03-13 09:45:03.000000000 +0100
@@ -419,13 +419,14 @@
ENTRY;
@@ -14299,7 +14588,7 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-module.c lustre/lustre/obdclass/
CERROR("error registering /proc/fs/lustre/devices\n");
diff -urNad lustre~/lustre/obdclass/linux/linux-sysctl.c lustre/lustre/obdclass/linux/linux-sysctl.c
--- lustre~/lustre/obdclass/linux/linux-sysctl.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-03-13 09:45:03.000000000 +0100
@@ -56,7 +56,9 @@
cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -14574,7 +14863,7 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-sysctl.c lustre/lustre/obdclass/
.maxlen = 0,
diff -urNad lustre~/lustre/obdclass/lprocfs_status.c lustre/lustre/obdclass/lprocfs_status.c
--- lustre~/lustre/obdclass/lprocfs_status.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/obdclass/lprocfs_status.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/obdclass/lprocfs_status.c 2009-03-13 09:45:03.000000000 +0100
@@ -151,7 +151,7 @@
LPROCFS_ENTRY();
@@ -14595,7 +14884,7 @@ diff -urNad lustre~/lustre/obdclass/lprocfs_status.c lustre/lustre/obdclass/lpro
return rc;
diff -urNad lustre~/lustre/obdclass/lprocfs_status.c.orig lustre/lustre/obdclass/lprocfs_status.c.orig
--- lustre~/lustre/obdclass/lprocfs_status.c.orig 1970-01-01 00:00:00.000000000 +0000
-+++ lustre/lustre/obdclass/lprocfs_status.c.orig 2009-03-12 10:32:27.000000000 +0100
++++ lustre/lustre/obdclass/lprocfs_status.c.orig 2009-03-13 09:45:03.000000000 +0100
@@ -0,0 +1,2062 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -16661,7 +16950,7 @@ diff -urNad lustre~/lustre/obdclass/lprocfs_status.c.orig lustre/lustre/obdclass
+#endif /* LPROCFS*/
diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c
--- lustre~/lustre/ptlrpc/service.c 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/lustre/ptlrpc/service.c 2009-03-12 11:02:51.000000000 +0100
++++ lustre/lustre/ptlrpc/service.c 2009-03-13 09:45:03.000000000 +0100
@@ -1501,7 +1501,7 @@
cfs_daemonize(name);
exit_fs(cfs_current());
--
Lustre Debian Packaging
More information about the Pkg-lustre-svn-commit
mailing list