The following commit has been merged in the lustre-1.6 branch: commit 1ce3eedb58b75b910ee9abd32fa602b4852916d7 Author: Patrick Winnertz <win...@debian.org> Date: Wed Aug 19 13:49:33 2009 +0200
Add configure check for SUBARCH for ARCH-dependant includes Furthermore autgen-sh output is removed from dpatch in order to test if the patches are working Signed-off-by: Patrick Winnertz <win...@debian.org> diff --git a/debian/patches/00list b/debian/patches/00list index 135e8c2..94cce37 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -23,4 +23,4 @@ fix-lustre-manpage.dpatch enable-quota.dpatch fix-symlink-attack.dpatch use_bash_instead_of_sh.dpatch -autogen-output.dpatch +#autogen-output.dpatch diff --git a/debian/patches/patchless_support_2.6.30.dpatch b/debian/patches/patchless_support_2.6.30.dpatch index 75108ee..5cc66f7 100755 --- a/debian/patches/patchless_support_2.6.30.dpatch +++ b/debian/patches/patchless_support_2.6.30.dpatch @@ -5,9 +5,49 @@ ## DP: Patch which will enable 2.6.26 patchless support for lustre, taken from #14250 @DPATCH@ +diff -urNad lustre~/build/autoMakefile.am.toplevel lustre/build/autoMakefile.am.toplevel +--- lustre~/build/autoMakefile.am.toplevel 2009-08-19 09:51:07.000000000 +0200 ++++ lustre/build/autoMakefile.am.toplevel 2009-08-19 14:10:45.000000000 +0200 +@@ -51,7 +51,7 @@ + modules: $(DEP) all-sources + $(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ) \ + -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \ +- LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include include/linux/autoconf.h' \ ++ LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Werror -Iarch/$(SUBARCH)/include -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include include/linux/autoconf.h' \ + $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \ + include/config/MARKER $@ + endif # LINUX +diff -urNad lustre~/build/autoconf/lustre-build-linux.m4 lustre/build/autoconf/lustre-build-linux.m4 +--- lustre~/build/autoconf/lustre-build-linux.m4 2009-08-19 09:51:07.000000000 +0200 ++++ lustre/build/autoconf/lustre-build-linux.m4 2009-08-19 14:11:38.000000000 +0200 +@@ -308,6 +308,24 @@ + AC_SUBST(UML_CFLAGS) + ]) + ++ ++# ++# SUBARCH of kernel ++# ++# ++LB_LINUX_SUBARCH ++ ++AC_DEFUN([LB_LINUX_SUBARCH], ++[SUBARCH= ++ ++AC_MSG_CHECKING([what kind of subarch you are using]) ++#taken from kernels topdir Makefile: ++SUBARCH=`uname -m | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/s390x/s390/ -e s/parisc64/parisc/ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ -e s/sh.*/sh/` ++AC_MSG_RESULT($SUBARCH) ++ ++AC_SUBST(SUBARCH) ++]) ++ + # these are like AC_TRY_COMPILE, but try to build modules against the + # kernel, inside the build directory + diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lnet.m4 --- lustre~/lnet/autoconf/lustre-lnet.m4 2009-08-19 09:51:08.000000000 +0200 -+++ lustre/lnet/autoconf/lustre-lnet.m4 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lnet/autoconf/lustre-lnet.m4 2009-08-19 14:10:45.000000000 +0200 @@ -1362,6 +1362,22 @@ ]) ]) @@ -42,7 +82,7 @@ diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lne # diff -urNad lustre~/lnet/include/lnet/types.h lustre/lnet/include/lnet/types.h --- lustre~/lnet/include/lnet/types.h 2008-08-07 11:50:16.000000000 +0200 -+++ lustre/lnet/include/lnet/types.h 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lnet/include/lnet/types.h 2009-08-19 14:10:45.000000000 +0200 @@ -39,6 +39,33 @@ #include <libcfs/libcfs.h> @@ -79,7 +119,7 @@ diff -urNad lustre~/lnet/include/lnet/types.h lustre/lnet/include/lnet/types.h typedef __u64 lnet_nid_t; diff -urNad lustre~/lnet/libcfs/linux/linux-curproc.c lustre/lnet/libcfs/linux/linux-curproc.c --- lustre~/lnet/libcfs/linux/linux-curproc.c 2008-11-20 10:27:06.000000000 +0100 -+++ lustre/lnet/libcfs/linux/linux-curproc.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lnet/libcfs/linux/linux-curproc.c 2009-08-19 14:10:45.000000000 +0200 @@ -41,6 +41,7 @@ */ @@ -215,7 +255,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-curproc.c lustre/lnet/libcfs/linux/l int cfs_capable(cfs_cap_t cap) diff -urNad lustre~/lnet/libcfs/linux/linux-module.c lustre/lnet/libcfs/linux/linux-module.c --- lustre~/lnet/libcfs/linux/linux-module.c 2008-09-15 20:44:53.000000000 +0200 -+++ lustre/lnet/libcfs/linux/linux-module.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lnet/libcfs/linux/linux-module.c 2009-08-19 14:10:45.000000000 +0200 @@ -139,7 +139,11 @@ struct cfs_psdev_file pfile; int rc = 0; @@ -230,7 +270,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-module.c lustre/lnet/libcfs/linux/li if ( _IOC_TYPE(cmd) != IOC_LIBCFS_TYPE || diff -urNad lustre~/lnet/libcfs/linux/linux-prim.c lustre/lnet/libcfs/linux/linux-prim.c --- lustre~/lnet/libcfs/linux/linux-prim.c 2009-08-19 09:51:08.000000000 +0200 -+++ lustre/lnet/libcfs/linux/linux-prim.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lnet/libcfs/linux/linux-prim.c 2009-08-19 14:10:45.000000000 +0200 @@ -40,6 +40,7 @@ #endif #include <linux/module.h> @@ -250,7 +290,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 2009-08-19 09:51:08.000000000 +0200 -+++ lustre/lnet/libcfs/linux/linux-tcpip.c 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lnet/libcfs/linux/linux-tcpip.c 2009-08-19 14:10:45.000000000 +0200 @@ -63,7 +63,11 @@ return rc; } @@ -265,7 +305,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-08-19 09:51:08.000000000 +0200 -+++ lustre/lnet/lnet/api-ni.c 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lnet/lnet/api-ni.c 2009-08-19 14:10:45.000000000 +0200 @@ -1032,7 +1032,7 @@ #ifdef __KERNEL__ if (lnd == NULL) { @@ -277,7 +317,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-08-19 09:51:08.000000000 +0200 -+++ lustre/lustre/autoconf/lustre-core.m4 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/autoconf/lustre-core.m4 2009-08-19 14:10:45.000000000 +0200 @@ -1106,15 +1106,20 @@ AC_DEFUN([LC_PAGE_CHECKED], [AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked]) @@ -802,7 +842,7 @@ 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 01:00:00.000000000 +0100 -+++ lustre/lustre/autoconf/lustre-core.m4.orig 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/autoconf/lustre-core.m4.orig 2009-08-19 14:10:45.000000000 +0200 @@ -0,0 +1,2075 @@ +#* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- +#* vim:expandtab:shiftwidth=8:tabstop=8: @@ -2881,7 +2921,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4.orig lustre/lustre/autoconf/l +]) diff -urNad lustre~/lustre/include/liblustre.h lustre/lustre/include/liblustre.h --- lustre~/lustre/include/liblustre.h 2009-08-19 09:51:08.000000000 +0200 -+++ lustre/lustre/include/liblustre.h 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/include/liblustre.h 2009-08-19 14:10:45.000000000 +0200 @@ -586,6 +586,55 @@ int signal; }; @@ -2964,7 +3004,7 @@ diff -urNad lustre~/lustre/include/liblustre.h lustre/lustre/include/liblustre.h #define init_waitqueue_entry(q,p) do { (q)->process = p; } while (0) diff -urNad lustre~/lustre/include/liblustre.h.orig lustre/lustre/include/liblustre.h.orig --- lustre~/lustre/include/liblustre.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ lustre/lustre/include/liblustre.h.orig 2009-08-19 09:51:08.000000000 +0200 ++++ lustre/lustre/include/liblustre.h.orig 2009-08-19 14:10:45.000000000 +0200 @@ -0,0 +1,917 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: @@ -3885,7 +3925,7 @@ diff -urNad lustre~/lustre/include/liblustre.h.orig lustre/lustre/include/liblus +#endif diff -urNad lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include/linux/lustre_compat25.h --- lustre~/lustre/include/linux/lustre_compat25.h 2009-08-19 09:51:08.000000000 +0200 -+++ lustre/lustre/include/linux/lustre_compat25.h 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/include/linux/lustre_compat25.h 2009-08-19 14:10:45.000000000 +0200 @@ -44,8 +44,8 @@ #endif @@ -4049,7 +4089,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 01:00:00.000000000 +0100 -+++ lustre/lustre/include/linux/lustre_compat25.h.orig 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/include/linux/lustre_compat25.h.orig 2009-08-19 14:10:45.000000000 +0200 @@ -0,0 +1,411 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: @@ -4464,7 +4504,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 2009-08-19 09:51:08.000000000 +0200 -+++ lustre/lustre/include/linux/lustre_lib.h 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/include/linux/lustre_lib.h 2009-08-19 14:10:45.000000000 +0200 @@ -49,7 +49,6 @@ # include <string.h> # include <sys/types.h> @@ -4475,7 +4515,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 2009-08-19 09:51:08.000000000 +0200 -+++ lustre/lustre/include/linux/lustre_patchless_compat.h 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/include/linux/lustre_patchless_compat.h 2009-08-19 14:10:45.000000000 +0200 @@ -52,7 +52,7 @@ BUG_ON(!PageLocked(page)); @@ -4496,7 +4536,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-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/include/lprocfs_status.h 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/include/lprocfs_status.h 2009-08-19 14:10:45.000000000 +0200 @@ -521,6 +521,8 @@ #define LPROCFS_EXIT() do { \ up_read(&_lprocfs_lock); \ @@ -4531,7 +4571,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 01:00:00.000000000 +0100 -+++ lustre/lustre/include/lprocfs_status.h.orig 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/include/lprocfs_status.h.orig 2009-08-19 14:10:45.000000000 +0200 @@ -0,0 +1,817 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: @@ -5352,7 +5392,7 @@ diff -urNad lustre~/lustre/include/lprocfs_status.h.orig lustre/lustre/include/l +#endif /* LPROCFS_SNMP_H */ diff -urNad lustre~/lustre/include/lustre/ll_fiemap.h lustre/lustre/include/lustre/ll_fiemap.h --- lustre~/lustre/include/lustre/ll_fiemap.h 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/include/lustre/ll_fiemap.h 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/include/lustre/ll_fiemap.h 2009-08-19 14:10:45.000000000 +0200 @@ -109,8 +109,45 @@ #else @@ -5401,7 +5441,7 @@ diff -urNad lustre~/lustre/include/lustre/ll_fiemap.h lustre/lustre/include/lust diff -urNad lustre~/lustre/liblustre/lutil.c lustre/lustre/liblustre/lutil.c --- lustre~/lustre/liblustre/lutil.c 2009-08-11 12:37:07.000000000 +0200 -+++ lustre/lustre/liblustre/lutil.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/liblustre/lutil.c 2009-08-19 14:10:45.000000000 +0200 @@ -184,7 +184,11 @@ { int i; @@ -5492,7 +5532,7 @@ diff -urNad lustre~/lustre/liblustre/lutil.c lustre/lustre/liblustre/lutil.c int cfs_capable(cfs_cap_t cap) diff -urNad lustre~/lustre/liblustre/super.c lustre/lustre/liblustre/super.c --- lustre~/lustre/liblustre/super.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/liblustre/super.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/liblustre/super.c 2009-08-19 14:10:45.000000000 +0200 @@ -82,7 +82,11 @@ struct intnl_stat *st = llu_i2stat(inode); mode_t mode = st->st_mode; @@ -5564,7 +5604,7 @@ diff -urNad lustre~/lustre/liblustre/super.c lustre/lustre/liblustre/super.c liblustre_wait_event(0); diff -urNad lustre~/lustre/llite/dir.c lustre/lustre/llite/dir.c --- lustre~/lustre/llite/dir.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/dir.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/llite/dir.c 2009-08-19 14:10:45.000000000 +0200 @@ -955,7 +955,11 @@ GOTO(out_quotactl, rc = -EPERM); break; @@ -5578,8 +5618,8 @@ diff -urNad lustre~/lustre/llite/dir.c lustre/lustre/llite/dir.c !cfs_capable(CFS_CAP_SYS_ADMIN)) GOTO(out_quotactl, rc = -EPERM); diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c ---- lustre~/lustre/llite/file.c 2009-08-19 10:40:28.000000000 +0200 -+++ lustre/lustre/llite/file.c 2009-08-19 10:40:29.000000000 +0200 +--- lustre~/lustre/llite/file.c 2009-08-19 14:10:44.000000000 +0200 ++++ lustre/lustre/llite/file.c 2009-08-19 14:10:45.000000000 +0200 @@ -1817,11 +1817,12 @@ #endif } @@ -5812,7 +5852,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 01:00:00.000000000 +0100 -+++ lustre/lustre/llite/file.c.orig 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/llite/file.c.orig 2009-08-19 14:10:45.000000000 +0200 @@ -0,0 +1,3335 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: @@ -9151,7 +9191,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-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/llite_internal.h 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/llite/llite_internal.h 2009-08-19 14:10:45.000000000 +0200 @@ -596,8 +596,13 @@ void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry); @@ -9187,7 +9227,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 01:00:00.000000000 +0100 -+++ lustre/lustre/llite/llite_internal.h.orig 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/llite/llite_internal.h.orig 2009-08-19 14:10:45.000000000 +0200 @@ -0,0 +1,1027 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: @@ -10218,7 +10258,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-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/llite_lib.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/llite/llite_lib.c 2009-08-19 14:10:45.000000000 +0200 @@ -1346,7 +1346,7 @@ rc = vmtruncate(inode, new_size); clear_bit(LLI_F_SRVLOCK, &lli->lli_flags); @@ -10242,7 +10282,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 01:00:00.000000000 +0100 -+++ lustre/lustre/llite/llite_lib.c.orig 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/llite/llite_lib.c.orig 2009-08-19 14:10:45.000000000 +0200 @@ -0,0 +1,2232 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: @@ -12478,7 +12518,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-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/llite_mmap.c 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/llite/llite_mmap.c 2009-08-19 14:10:45.000000000 +0200 @@ -81,8 +81,7 @@ int lt_get_mmap_locks(struct ll_lock_tree *tree, unsigned long addr, size_t count); @@ -12778,7 +12818,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-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/llite_nfs.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/llite/llite_nfs.c 2009-08-19 14:10:45.000000000 +0200 @@ -68,36 +68,30 @@ } @@ -13075,7 +13115,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-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/lloop.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/llite/lloop.c 2009-08-19 14:10:45.000000000 +0200 @@ -152,7 +152,7 @@ struct semaphore lo_bh_mutex; atomic_t lo_pending; @@ -13259,7 +13299,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 01:00:00.000000000 +0100 -+++ lustre/lustre/llite/lloop.c.orig 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/llite/lloop.c.orig 2009-08-19 14:10:45.000000000 +0200 @@ -0,0 +1,777 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: @@ -14040,7 +14080,7 @@ diff -urNad lustre~/lustre/llite/lloop.c.orig lustre/lustre/llite/lloop.c.orig +MODULE_LICENSE("GPL"); diff -urNad lustre~/lustre/llite/lproc_llite.c lustre/lustre/llite/lproc_llite.c --- lustre~/lustre/llite/lproc_llite.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/lproc_llite.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/llite/lproc_llite.c 2009-08-19 14:10:45.000000000 +0200 @@ -649,7 +649,11 @@ sbi->ll_stats_track_id == current->p_pptr->pid) lprocfs_counter_add(sbi->ll_stats, op, count); @@ -14055,7 +14095,7 @@ diff -urNad lustre~/lustre/llite/lproc_llite.c lustre/lustre/llite/lproc_llite.c EXPORT_SYMBOL(ll_stats_ops_tally); diff -urNad lustre~/lustre/llite/namei.c lustre/lustre/llite/namei.c --- lustre~/lustre/llite/namei.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/namei.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/llite/namei.c 2009-08-19 14:10:45.000000000 +0200 @@ -875,7 +875,11 @@ GOTO(err_exit, err); @@ -14070,7 +14110,7 @@ diff -urNad lustre~/lustre/llite/namei.c lustre/lustre/llite/namei.c GOTO(err_exit, err); diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c --- lustre~/lustre/llite/rw.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/rw.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/llite/rw.c 2009-08-19 14:10:45.000000000 +0200 @@ -61,6 +61,8 @@ #define DEBUG_SUBSYSTEM S_LLITE @@ -14301,7 +14341,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 01:00:00.000000000 +0100 -+++ lustre/lustre/llite/rw.c.orig 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/llite/rw.c.orig 2009-08-19 14:10:45.000000000 +0200 @@ -0,0 +1,2215 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: @@ -16520,7 +16560,7 @@ diff -urNad lustre~/lustre/llite/rw.c.orig lustre/lustre/llite/rw.c.orig +} diff -urNad lustre~/lustre/llite/rw24.c lustre/lustre/llite/rw24.c --- lustre~/lustre/llite/rw24.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/rw24.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/llite/rw24.c 2009-08-19 14:10:45.000000000 +0200 @@ -150,8 +150,13 @@ .readpage = ll_readpage, .direct_IO = ll_direct_IO_24, @@ -16537,7 +16577,7 @@ diff -urNad lustre~/lustre/llite/rw24.c lustre/lustre/llite/rw24.c .bmap = NULL, diff -urNad lustre~/lustre/llite/rw26.c lustre/lustre/llite/rw26.c --- lustre~/lustre/llite/rw26.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/rw26.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/llite/rw26.c 2009-08-19 14:10:45.000000000 +0200 @@ -339,8 +339,13 @@ .writepages = generic_writepages, .set_page_dirty = __set_page_dirty_nobuffers, @@ -16554,7 +16594,7 @@ diff -urNad lustre~/lustre/llite/rw26.c lustre/lustre/llite/rw26.c .bmap = NULL diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c --- lustre~/lustre/llite/symlink.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/llite/symlink.c 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/llite/symlink.c 2009-08-19 14:10:45.000000000 +0200 @@ -177,8 +177,12 @@ up(&lli->lli_size_sem); } @@ -16570,7 +16610,7 @@ diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt.c lustre/lustre/lvfs/lustre_quota_fmt.c --- lustre~/lustre/lvfs/lustre_quota_fmt.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/lvfs/lustre_quota_fmt.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/lvfs/lustre_quota_fmt.c 2009-08-19 14:10:45.000000000 +0200 @@ -50,7 +50,12 @@ #include <linux/init.h> #include <linux/module.h> @@ -16587,7 +16627,7 @@ diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt.c lustre/lustre/lvfs/lustre_quo #include <asm/uaccess.h> diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt_convert.c lustre/lustre/lvfs/lustre_quota_fmt_convert.c --- lustre~/lustre/lvfs/lustre_quota_fmt_convert.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c 2009-08-19 14:10:45.000000000 +0200 @@ -50,7 +50,11 @@ #include <linux/init.h> #include <linux/module.h> @@ -16603,7 +16643,7 @@ diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt_convert.c lustre/lustre/lvfs/lu #include <asm/uaccess.h> diff -urNad lustre~/lustre/lvfs/lvfs_linux.c lustre/lustre/lvfs/lvfs_linux.c --- lustre~/lustre/lvfs/lvfs_linux.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/lvfs/lvfs_linux.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/lvfs/lvfs_linux.c 2009-08-19 14:10:45.000000000 +0200 @@ -86,10 +86,19 @@ current_ngroups = 0; } else { @@ -16730,7 +16770,7 @@ diff -urNad lustre~/lustre/lvfs/lvfs_linux.c lustre/lustre/lvfs/lvfs_linux.c diff -urNad lustre~/lustre/lvfs/upcall_cache.c lustre/lustre/lvfs/upcall_cache.c --- lustre~/lustre/lvfs/upcall_cache.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/lvfs/upcall_cache.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/lvfs/upcall_cache.c 2009-08-19 14:10:45.000000000 +0200 @@ -216,7 +216,7 @@ entry->ue_primary = primary; @@ -16742,7 +16782,7 @@ diff -urNad lustre~/lustre/lvfs/upcall_cache.c lustre/lustre/lvfs/upcall_cache.c for (j = 0; j < cp_count; j++) diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c --- lustre~/lustre/mdc/mdc_lib.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/mdc/mdc_lib.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/mdc/mdc_lib.c 2009-08-19 14:10:45.000000000 +0200 @@ -56,8 +56,13 @@ struct mds_body *b; @@ -16857,7 +16897,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c b->flags = flags | MDS_BFLAG_EXT_FLAGS; diff -urNad lustre~/lustre/mgc/mgc_request.c lustre/lustre/mgc/mgc_request.c --- lustre~/lustre/mgc/mgc_request.c 2009-08-19 09:51:09.000000000 +0200 -+++ lustre/lustre/mgc/mgc_request.c 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/mgc/mgc_request.c 2009-08-19 14:10:45.000000000 +0200 @@ -415,7 +415,7 @@ obd->obd_lvfs_ctxt.fs = get_ds(); @@ -16869,7 +16909,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-08-19 09:51:10.000000000 +0200 -+++ lustre/lustre/obdclass/linux/linux-module.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/obdclass/linux/linux-module.c 2009-08-19 14:10:45.000000000 +0200 @@ -204,7 +204,11 @@ int err = 0; ENTRY; @@ -16901,7 +16941,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-08-19 09:51:10.000000000 +0200 -+++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-08-19 14:10:45.000000000 +0200 @@ -56,7 +56,9 @@ cfs_sysctl_table_header_t *obd_table_header = NULL; @@ -17176,7 +17216,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-08-19 09:51:10.000000000 +0200 -+++ lustre/lustre/obdclass/lprocfs_status.c 2009-08-19 10:40:29.000000000 +0200 ++++ lustre/lustre/obdclass/lprocfs_status.c 2009-08-19 14:10:45.000000000 +0200 @@ -151,7 +151,7 @@ LPROCFS_ENTRY(); @@ -17197,7 +17237,7 @@ diff -urNad lustre~/lustre/obdclass/lprocfs_status.c lustre/lustre/obdclass/lpro return rc; diff -urNad lustre~/lustre/obdclass/lustre_handles.c lustre/lustre/obdclass/lustre_handles.c --- lustre~/lustre/obdclass/lustre_handles.c 2009-08-19 09:51:10.000000000 +0200 -+++ lustre/lustre/obdclass/lustre_handles.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/obdclass/lustre_handles.c 2009-08-19 14:10:45.000000000 +0200 @@ -56,6 +56,14 @@ # define rcu_read_unlock() spin_unlock(&bucket->lock) #endif /* ifndef HAVE_RCU */ @@ -17223,7 +17263,7 @@ diff -urNad lustre~/lustre/obdclass/lustre_handles.c lustre/lustre/obdclass/lust struct portals_handle *h; diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c --- lustre~/lustre/ptlrpc/service.c 2009-08-19 09:51:10.000000000 +0200 -+++ lustre/lustre/ptlrpc/service.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/ptlrpc/service.c 2009-08-19 14:10:45.000000000 +0200 @@ -1497,11 +1497,17 @@ { struct fs_struct *fs = current->fs; @@ -17245,7 +17285,7 @@ diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c static void diff -urNad lustre~/lustre/quota/quota_context.c lustre/lustre/quota/quota_context.c --- lustre~/lustre/quota/quota_context.c 2009-08-19 09:51:10.000000000 +0200 -+++ lustre/lustre/quota/quota_context.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/quota/quota_context.c 2009-08-19 14:10:45.000000000 +0200 @@ -240,7 +240,11 @@ int ret = 0; ENTRY; @@ -17308,7 +17348,7 @@ diff -urNad lustre~/lustre/quota/quota_context.c lustre/lustre/quota/quota_conte data.obd = obd; diff -urNad lustre~/lustre/quota/quota_interface.c lustre/lustre/quota/quota_interface.c --- lustre~/lustre/quota/quota_interface.c 2009-08-19 09:51:10.000000000 +0200 -+++ lustre/lustre/quota/quota_interface.c 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/quota/quota_interface.c 2009-08-19 14:10:45.000000000 +0200 @@ -149,7 +149,11 @@ { ENTRY; @@ -17347,7 +17387,7 @@ diff -urNad lustre~/lustre/quota/quota_interface.c lustre/lustre/quota/quota_int spin_lock(&qctxt->lqc_lock); diff -urNad lustre~/lustre/quota/quota_internal.h lustre/lustre/quota/quota_internal.h --- lustre~/lustre/quota/quota_internal.h 2009-08-19 09:51:10.000000000 +0200 -+++ lustre/lustre/quota/quota_internal.h 2009-08-19 10:46:25.000000000 +0200 ++++ lustre/lustre/quota/quota_internal.h 2009-08-19 14:10:45.000000000 +0200 @@ -41,6 +41,13 @@ #ifdef HAVE_QUOTA_SUPPORT diff --git a/debian/rules b/debian/rules index 144e55c..0f612df 100755 --- a/debian/rules +++ b/debian/rules @@ -46,13 +46,13 @@ BUILDDIR=debian/build autogen: autogen-stamp autogen-stamp: patch-stamp - #cp /usr/share/misc/config.sub config.sub - #cp /usr/share/misc/config.sub libsysio/config.sub - #cp /usr/share/misc/config.sub ldiskfs/config.sub - #cp /usr/share/misc/config.guess config.guess - #cp /usr/share/misc/config.guess libsysio/config.guess - #cp /usr/share/misc/config.guess ldiskfs/config.guess - #sh ./autogen.sh + cp /usr/share/misc/config.sub config.sub + cp /usr/share/misc/config.sub libsysio/config.sub + cp /usr/share/misc/config.sub ldiskfs/config.sub + cp /usr/share/misc/config.guess config.guess + cp /usr/share/misc/config.guess libsysio/config.guess + cp /usr/share/misc/config.guess ldiskfs/config.guess + sh ./autogen.sh touch $@ configure: configure-stamp -- Lustre Debian Packaging _______________________________________________ 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