The following commit has been merged in the master branch: commit 5182d5aaa9bfe13c187236f9fa38c2a9d538b030 Author: Patrick Winnertz <win...@debian.org> Date: Tue Mar 10 11:49:48 2009 +0100
Added configure check for blk_cleanup_queue which replaced blk_put_queue in 2.6.25-rc4 (Closes: 508078) Signed-off-by: Patrick Winnertz <win...@debian.org> diff --git a/debian/patches/patchless_support_2.6.24.dpatch b/debian/patches/patchless_support_2.6.24.dpatch index 7ae3d95..77832c4 100755 --- a/debian/patches/patchless_support_2.6.24.dpatch +++ b/debian/patches/patchless_support_2.6.24.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 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/autoconf/lustre-lnet.m4 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/autoconf/lustre-lnet.m4 2009-03-10 11:41:03.000000000 +0100 @@ -1290,6 +1290,41 @@ ]) ]) @@ -62,7 +62,7 @@ diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lne # diff -urNad lustre~/lnet/include/libcfs/curproc.h lustre/lnet/include/libcfs/curproc.h --- lustre~/lnet/include/libcfs/curproc.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/include/libcfs/curproc.h 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/include/libcfs/curproc.h 2009-03-10 11:41:03.000000000 +0100 @@ -72,6 +72,11 @@ */ cfs_kernel_cap_t cfs_curproc_cap_get(void); @@ -77,7 +77,7 @@ diff -urNad lustre~/lnet/include/libcfs/curproc.h lustre/lnet/include/libcfs/cur /* __LIBCFS_CURPROC_H__ */ diff -urNad lustre~/lnet/include/libcfs/linux/linux-prim.h lustre/lnet/include/libcfs/linux/linux-prim.h --- lustre~/lnet/include/libcfs/linux/linux-prim.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/include/libcfs/linux/linux-prim.h 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/include/libcfs/linux/linux-prim.h 2009-03-10 11:41:03.000000000 +0100 @@ -84,6 +84,17 @@ #endif #define cfs_unregister_sysctl_table(t) unregister_sysctl_table(t) @@ -98,7 +98,7 @@ diff -urNad lustre~/lnet/include/libcfs/linux/linux-prim.h lustre/lnet/include/l */ diff -urNad lustre~/lnet/klnds/gmlnd/gmlnd_module.c lustre/lnet/klnds/gmlnd/gmlnd_module.c --- lustre~/lnet/klnds/gmlnd/gmlnd_module.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/gmlnd/gmlnd_module.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/gmlnd/gmlnd_module.c 2009-03-10 11:41:03.000000000 +0100 @@ -78,9 +78,37 @@ }; @@ -203,7 +203,7 @@ diff -urNad lustre~/lnet/klnds/gmlnd/gmlnd_module.c lustre/lnet/klnds/gmlnd/gmln .maxlen = 0, diff -urNad lustre~/lnet/klnds/iiblnd/iiblnd_modparams.c lustre/lnet/klnds/iiblnd/iiblnd_modparams.c --- lustre~/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/iiblnd/iiblnd_modparams.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/iiblnd/iiblnd_modparams.c 2009-03-10 11:41:03.000000000 +0100 @@ -119,9 +119,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 @@ diff -urNad lustre~/lnet/klnds/iiblnd/iiblnd_modparams.c lustre/lnet/klnds/iibln .maxlen = 0, diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd.h lustre/lnet/klnds/o2iblnd/o2iblnd.h --- lustre~/lnet/klnds/o2iblnd/o2iblnd.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/o2iblnd/o2iblnd.h 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/o2iblnd/o2iblnd.h 2009-03-10 11:41:03.000000000 +0100 @@ -773,3 +773,13 @@ int kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed, unsigned int niov, struct iovec *iov, lnet_kiov_t *kiov, @@ -401,7 +401,7 @@ diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd.h lustre/lnet/klnds/o2iblnd/o2ibl +#endif diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd_cb.c lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c --- lustre~/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c 2009-03-10 11:41:03.000000000 +0100 @@ -643,9 +643,7 @@ fragnob = min((int)(iov->iov_len - offset), nob); fragnob = min(fragnob, (int)PAGE_SIZE - page_offset); @@ -430,7 +430,7 @@ diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd_cb.c lustre/lnet/klnds/o2iblnd/o2 nkiov--; diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd_modparams.c lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c --- lustre~/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2009-03-10 11:41:03.000000000 +0100 @@ -130,9 +130,51 @@ static char ipif_basename_space[32]; @@ -621,7 +621,7 @@ diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd_modparams.c lustre/lnet/klnds/o2i .maxlen = 0, diff -urNad lustre~/lnet/klnds/openiblnd/openiblnd_modparams.c lustre/lnet/klnds/openiblnd/openiblnd_modparams.c --- lustre~/lnet/klnds/openiblnd/openiblnd_modparams.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/openiblnd/openiblnd_modparams.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/openiblnd/openiblnd_modparams.c 2009-03-10 11:41:03.000000000 +0100 @@ -100,9 +100,42 @@ #if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM @@ -767,7 +767,7 @@ diff -urNad lustre~/lnet/klnds/openiblnd/openiblnd_modparams.c lustre/lnet/klnds .maxlen = 0, diff -urNad lustre~/lnet/klnds/ptllnd/ptllnd_modparams.c lustre/lnet/klnds/ptllnd/ptllnd_modparams.c --- lustre~/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/ptllnd/ptllnd_modparams.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/ptllnd/ptllnd_modparams.c 2009-03-10 11:41:03.000000000 +0100 @@ -156,9 +156,54 @@ } #endif @@ -980,7 +980,7 @@ diff -urNad lustre~/lnet/klnds/ptllnd/ptllnd_modparams.c lustre/lnet/klnds/ptlln .maxlen = 0, diff -urNad lustre~/lnet/klnds/qswlnd/qswlnd_modparams.c lustre/lnet/klnds/qswlnd/qswlnd_modparams.c --- lustre~/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/qswlnd/qswlnd_modparams.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/qswlnd/qswlnd_modparams.c 2009-03-10 11:41:03.000000000 +0100 @@ -87,9 +87,45 @@ }; @@ -1129,7 +1129,7 @@ diff -urNad lustre~/lnet/klnds/qswlnd/qswlnd_modparams.c lustre/lnet/klnds/qswln .maxlen = 0, diff -urNad lustre~/lnet/klnds/ralnd/ralnd_modparams.c lustre/lnet/klnds/ralnd/ralnd_modparams.c --- lustre~/lnet/klnds/ralnd/ralnd_modparams.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/ralnd/ralnd_modparams.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/ralnd/ralnd_modparams.c 2009-03-10 11:41:03.000000000 +0100 @@ -89,9 +89,37 @@ }; @@ -1252,7 +1252,7 @@ diff -urNad lustre~/lnet/klnds/ralnd/ralnd_modparams.c lustre/lnet/klnds/ralnd/r .maxlen = 0, diff -urNad lustre~/lnet/klnds/socklnd/socklnd_lib-linux.c lustre/lnet/klnds/socklnd/socklnd_lib-linux.c --- lustre~/lnet/klnds/socklnd/socklnd_lib-linux.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/socklnd/socklnd_lib-linux.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/socklnd/socklnd_lib-linux.c 2009-03-10 11:41:03.000000000 +0100 @@ -37,197 +37,244 @@ #include "socklnd.h" @@ -1579,7 +1579,7 @@ diff -urNad lustre~/lnet/klnds/socklnd/socklnd_lib-linux.c lustre/lnet/klnds/soc diff -urNad lustre~/lnet/klnds/viblnd/viblnd_modparams.c lustre/lnet/klnds/viblnd/viblnd_modparams.c --- lustre~/lnet/klnds/viblnd/viblnd_modparams.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/klnds/viblnd/viblnd_modparams.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/klnds/viblnd/viblnd_modparams.c 2009-03-10 11:41:03.000000000 +0100 @@ -142,6 +142,56 @@ #endif }; @@ -1819,7 +1819,7 @@ diff -urNad lustre~/lnet/klnds/viblnd/viblnd_modparams.c lustre/lnet/klnds/vibln .maxlen = 0, diff -urNad lustre~/lnet/libcfs/linux/linux-curproc.c lustre/lnet/libcfs/linux/linux-curproc.c --- lustre~/lnet/libcfs/linux/linux-curproc.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/libcfs/linux/linux-curproc.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/libcfs/linux/linux-curproc.c 2009-03-10 11:41:03.000000000 +0100 @@ -131,6 +131,19 @@ current->cap_effective = cap; } @@ -1851,7 +1851,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-curproc.c lustre/lnet/libcfs/linux/l * c-indentation-style: "K&R" diff -urNad lustre~/lnet/libcfs/linux/linux-proc.c lustre/lnet/libcfs/linux/linux-proc.c --- lustre~/lnet/libcfs/linux/linux-proc.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/libcfs/linux/linux-proc.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/libcfs/linux/linux-proc.c 2009-03-10 11:41:03.000000000 +0100 @@ -79,7 +79,8 @@ static cfs_sysctl_table_header_t *lnet_table_header = NULL; extern char lnet_upcall[1024]; @@ -2096,7 +2096,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-proc.c lustre/lnet/libcfs/linux/linu int insert_proc(void) diff -urNad lustre~/lnet/lnet/router_proc.c lustre/lnet/lnet/router_proc.c --- lustre~/lnet/lnet/router_proc.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lnet/lnet/router_proc.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lnet/lnet/router_proc.c 2009-03-10 11:41:03.000000000 +0100 @@ -32,12 +32,13 @@ /* this is really lnet_proc.c */ @@ -2140,7 +2140,7 @@ diff -urNad lustre~/lnet/lnet/router_proc.c lustre/lnet/lnet/router_proc.c #else diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4 --- lustre~/lustre/autoconf/lustre-core.m4 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/autoconf/lustre-core.m4 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/autoconf/lustre-core.m4 2009-03-10 11:46:22.000000000 +0100 @@ -1105,20 +1105,79 @@ ]) ]) @@ -2196,13 +2196,13 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre + #include <linux/page-flags.h> + #include <linux/autoconf.h> + #include <linux/mm_types.h> -+],[ + ],[ + struct page *p; + + /* 2.6.26 use function instead of define for it */ + SetPageChecked(p); + PageChecked(p); - ],[ ++],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_PAGE_CHECKED, 1, + [does kernel have PageChecked and SetPageChecked]) @@ -2232,7 +2232,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE], [LB_CHECK_SYMBOL_EXPORT([truncate_complete_page], -@@ -1271,11 +1331,156 @@ +@@ -1271,11 +1331,170 @@ # 2.6.23 extract nfs export related data into exportfs.h AC_DEFUN([LC_HAVE_EXPORTFS_H], @@ -2391,10 +2391,24 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre +],[ + AC_MSG_RESULT([no]) +]) ++]) ++# blk_put_queue is replaced in 2.6.25-rc5 by blk_cleanup_queue ++AC_DEFUN([LC_BLK_CLEANUP_QUEUE], ++[AC_MSG_CHECKING([if blk_cleanup_queue exists]) ++LB_LINUX_TRY_COMPILE([ ++ #include <linux/blkdev.h> ++],[ ++ blk_cleanup_queue(NULL); ++],[ ++ AC_DEFINE(HAVE_BLK_CLEANUP_QUEUE, 1, [blk_cleanup_queue exists]) ++ AC_MSG_RESULT([yes]) ++],[ ++ AC_MSG_RESULT([no]) ++]) ]) # -@@ -1377,6 +1582,19 @@ +@@ -1377,6 +1596,20 @@ LC_UNREGISTER_BLKDEV_RETURN_INT LC_KERNEL_SPLICE_READ LC_HAVE_EXPORTFS_H @@ -2411,10 +2425,11 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre + LC_RCU_LIST_SAFE + LC_PATH_RELEASE + IGET_CALL_IS_PRESENT ++ LC_BLK_CLEANUP_QUEUE ]) # -@@ -1609,6 +1827,7 @@ +@@ -1609,6 +1842,7 @@ ],[ AC_MSG_RESULT([no]) ]) @@ -2424,7 +2439,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre ]) diff -urNad lustre~/lustre/include/liblustre.h lustre/lustre/include/liblustre.h --- lustre~/lustre/include/liblustre.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/include/liblustre.h 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/include/liblustre.h 2009-03-10 11:41:03.000000000 +0100 @@ -743,11 +743,13 @@ struct _cap_struct; typedef struct _cap_struct *cap_t; @@ -2476,7 +2491,7 @@ diff -urNad lustre~/lustre/include/liblustre.h lustre/lustre/include/liblustre.h diff -urNad lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include/linux/lustre_compat25.h --- lustre~/lustre/include/linux/lustre_compat25.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/include/linux/lustre_compat25.h 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/include/linux/lustre_compat25.h 2009-03-10 11:41:03.000000000 +0100 @@ -57,6 +57,28 @@ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */ @@ -2573,7 +2588,7 @@ diff -urNad lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include #endif /* _COMPAT25_H */ diff -urNad lustre~/lustre/include/linux/lvfs.h lustre/lustre/include/linux/lvfs.h --- lustre~/lustre/include/linux/lvfs.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/include/linux/lvfs.h 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/include/linux/lvfs.h 2009-03-10 11:41:03.000000000 +0100 @@ -64,7 +64,7 @@ struct upcall_cache_entry *luc_uce; __u32 luc_fsuid; @@ -2585,7 +2600,7 @@ diff -urNad lustre~/lustre/include/linux/lvfs.h lustre/lustre/include/linux/lvfs __u32 luc_umask; diff -urNad lustre~/lustre/include/lprocfs_status.h lustre/lustre/include/lprocfs_status.h --- lustre~/lustre/include/lprocfs_status.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/include/lprocfs_status.h 2009-03-09 15:45:14.000000000 +0100 ++++ lustre/lustre/include/lprocfs_status.h 2009-03-10 11:41:03.000000000 +0100 @@ -509,6 +509,8 @@ #define LPROCFS_EXIT() do { \ up_read(&_lprocfs_lock); \ @@ -2611,7 +2626,7 @@ diff -urNad lustre~/lustre/include/lprocfs_status.h lustre/lustre/include/lprocf } while(0) diff -urNad lustre~/lustre/include/lustre_log.h lustre/lustre/include/lustre_log.h --- lustre~/lustre/include/lustre_log.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/include/lustre_log.h 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/include/lustre_log.h 2009-03-10 11:41:03.000000000 +0100 @@ -238,14 +238,6 @@ void *llog_proc_cb; }; @@ -2674,7 +2689,7 @@ diff -urNad lustre~/lustre/include/lustre_log.h lustre/lustre/include/lustre_log diff -urNad lustre~/lustre/include/lustre_mds.h lustre/lustre/include/lustre_mds.h --- lustre~/lustre/include/lustre_mds.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/include/lustre_mds.h 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/include/lustre_mds.h 2009-03-10 11:41:03.000000000 +0100 @@ -209,7 +209,7 @@ struct page *, struct ptlrpc_request **); int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data, @@ -2685,8 +2700,8 @@ diff -urNad lustre~/lustre/include/lustre_mds.h lustre/lustre/include/lustre_mds struct ptlrpc_request **request); int mdc_link(struct obd_export *exp, struct mdc_op_data *data, diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c ---- lustre~/lustre/llite/file.c 2009-03-09 15:40:21.000000000 +0100 -+++ lustre/lustre/llite/file.c 2009-03-09 15:40:21.000000000 +0100 +--- lustre~/lustre/llite/file.c 2009-03-10 11:41:02.000000000 +0100 ++++ lustre/lustre/llite/file.c 2009-03-10 11:41:03.000000000 +0100 @@ -1820,9 +1820,17 @@ /* * Send file content (through pagecache) somewhere with helper @@ -2802,7 +2817,7 @@ diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c .fsync = ll_fsync, diff -urNad lustre~/lustre/llite/llite_internal.h lustre/lustre/llite/llite_internal.h --- lustre~/lustre/llite/llite_internal.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/llite/llite_internal.h 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/llite/llite_internal.h 2009-03-10 11:41:03.000000000 +0100 @@ -748,9 +748,6 @@ /* llite/llite_nfs.c */ extern struct export_operations lustre_export_operations; @@ -2815,7 +2830,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_lib.c lustre/lustre/llite/llite_lib.c --- lustre~/lustre/llite/llite_lib.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/llite/llite_lib.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/llite/llite_lib.c 2009-03-10 11:41:03.000000000 +0100 @@ -1373,7 +1373,7 @@ rc = vmtruncate(inode, new_size); clear_bit(LLI_F_SRVLOCK, &lli->lli_flags); @@ -2827,7 +2842,7 @@ diff -urNad lustre~/lustre/llite/llite_lib.c lustre/lustre/llite/llite_lib.c } diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c --- lustre~/lustre/llite/llite_mmap.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/llite/llite_mmap.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/llite/llite_mmap.c 2009-03-10 11:41:03.000000000 +0100 @@ -53,9 +53,6 @@ #include <linux/mm.h> #include <linux/pagemap.h> @@ -3087,7 +3102,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 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/llite/llite_nfs.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/llite/llite_nfs.c 2009-03-10 11:41:03.000000000 +0100 @@ -57,11 +57,7 @@ return (key0 << 1); } @@ -3364,7 +3379,7 @@ diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c +}; diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c --- lustre~/lustre/llite/lloop.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/llite/lloop.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/llite/lloop.c 2009-03-10 11:48:26.000000000 +0100 @@ -312,7 +312,7 @@ if (atomic_dec_and_test(&lo->lo_pending)) up(&lo->lo_bh_mutex); @@ -3383,9 +3398,33 @@ diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c } /* +@@ -736,7 +736,11 @@ + + out_mem4: + while (i--) ++#ifndef HAVE_BLK_CLEANUP_QUEUE + blk_put_queue(loop_dev[i].lo_queue); ++#else ++ blk_cleanup_queue(loop_dev[i].lo_queue); ++#endif + i = max_loop; + out_mem3: + while (i--) +@@ -758,7 +762,11 @@ + ll_iocontrol_unregister(ll_iocontrol_magic); + for (i = 0; i < max_loop; i++) { + del_gendisk(disks[i]); ++#ifndef HAVE_BLK_CLEANUP_QUEUE + blk_put_queue(loop_dev[i].lo_queue); ++#else ++ blk_cleanup_queue(loop_dev[i].lo_queue); ++#endif + put_disk(disks[i]); + } + if (ll_unregister_blkdev(lloop_major, "lloop")) diff -urNad lustre~/lustre/llite/namei.c lustre/lustre/llite/namei.c --- lustre~/lustre/llite/namei.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/llite/namei.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/llite/namei.c 2009-03-10 11:41:03.000000000 +0100 @@ -901,7 +901,7 @@ err = mdc_create(sbi->ll_mdc_exp, &op_data, tgt, tgt_len, @@ -3397,7 +3436,7 @@ diff -urNad lustre~/lustre/llite/namei.c lustre/lustre/llite/namei.c diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c --- lustre~/lustre/llite/rw.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/llite/rw.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/llite/rw.c 2009-03-10 11:41:03.000000000 +0100 @@ -186,7 +186,7 @@ GOTO(out_unlock, 0); } @@ -3409,7 +3448,7 @@ diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c struct ost_lvb lvb; diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c --- lustre~/lustre/llite/symlink.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/llite/symlink.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/llite/symlink.c 2009-03-10 11:41:03.000000000 +0100 @@ -171,8 +171,12 @@ rc = ll_readlink_internal(inode, &request, &symname); up(&lli->lli_size_sem); @@ -3425,7 +3464,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 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/lvfs/lvfs_linux.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/lvfs/lvfs_linux.c 2009-03-10 11:41:03.000000000 +0100 @@ -148,10 +148,10 @@ */ @@ -3480,7 +3519,7 @@ diff -urNad lustre~/lustre/lvfs/lvfs_linux.c lustre/lustre/lvfs/lvfs_linux.c diff -urNad lustre~/lustre/mdc/mdc_internal.h lustre/lustre/mdc/mdc_internal.h --- lustre~/lustre/mdc/mdc_internal.h 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/mdc/mdc_internal.h 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/mdc/mdc_internal.h 2009-03-10 11:41:03.000000000 +0100 @@ -60,7 +60,7 @@ void *ea2, int ea2len); void mdc_create_pack(struct ptlrpc_request *req, int offset, @@ -3492,7 +3531,7 @@ diff -urNad lustre~/lustre/mdc/mdc_internal.h lustre/lustre/mdc/mdc_internal.h struct mdc_op_data *op_data, __u32 mode, __u64 rdev, diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c --- lustre~/lustre/mdc/mdc_lib.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/mdc/mdc_lib.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/mdc/mdc_lib.c 2009-03-10 11:41:03.000000000 +0100 @@ -58,7 +58,7 @@ b = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*b)); b->fsuid = current->fsuid; @@ -3585,7 +3624,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c /* skip MDS_BFLAG_EXT_FLAGS to verify the "client < 1.4.7" case diff -urNad lustre~/lustre/mdc/mdc_reint.c lustre/lustre/mdc/mdc_reint.c --- lustre~/lustre/mdc/mdc_reint.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/mdc/mdc_reint.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/mdc/mdc_reint.c 2009-03-10 11:41:03.000000000 +0100 @@ -176,7 +176,7 @@ int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data, @@ -3597,7 +3636,7 @@ diff -urNad lustre~/lustre/mdc/mdc_reint.c lustre/lustre/mdc/mdc_reint.c struct obd_device *obd = exp->exp_obd; diff -urNad lustre~/lustre/mgc/mgc_request.c lustre/lustre/mgc/mgc_request.c --- lustre~/lustre/mgc/mgc_request.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/mgc/mgc_request.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/mgc/mgc_request.c 2009-03-10 11:41:03.000000000 +0100 @@ -410,7 +410,7 @@ obd->obd_lvfs_ctxt.fs = get_ds(); @@ -3609,7 +3648,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 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/obdclass/linux/linux-module.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/obdclass/linux/linux-module.c 2009-03-10 11:41:03.000000000 +0100 @@ -418,7 +418,7 @@ ENTRY; @@ -3621,7 +3660,7 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-module.c lustre/lustre/obdclass/ "LustreError: error registering /proc/fs/lustre\n"); diff -urNad lustre~/lustre/obdclass/linux/linux-sysctl.c lustre/lustre/obdclass/linux/linux-sysctl.c --- lustre~/lustre/obdclass/linux/linux-sysctl.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-03-10 11:41:03.000000000 +0100 @@ -59,7 +59,9 @@ cfs_sysctl_table_header_t *obd_table_header = NULL; @@ -3933,7 +3972,7 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-sysctl.c lustre/lustre/obdclass/ void obd_sysctl_init (void) diff -urNad lustre~/lustre/obdclass/llog_obd.c lustre/lustre/obdclass/llog_obd.c --- lustre~/lustre/obdclass/llog_obd.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/obdclass/llog_obd.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/obdclass/llog_obd.c 2009-03-10 11:41:03.000000000 +0100 @@ -203,7 +203,7 @@ struct lov_stripe_md *lsm, struct llog_cookie *logcookies, int numcookies) @@ -3958,7 +3997,7 @@ diff -urNad lustre~/lustre/obdclass/llog_obd.c lustre/lustre/obdclass/llog_obd.c EXPORT_SYMBOL(llog_add); diff -urNad lustre~/lustre/obdclass/lprocfs_status.c lustre/lustre/obdclass/lprocfs_status.c --- lustre~/lustre/obdclass/lprocfs_status.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/obdclass/lprocfs_status.c 2009-03-09 15:45:40.000000000 +0100 ++++ lustre/lustre/obdclass/lprocfs_status.c 2009-03-10 11:41:03.000000000 +0100 @@ -132,6 +132,8 @@ proc->read_proc = read_proc; proc->write_proc = write_proc; @@ -3988,7 +4027,7 @@ diff -urNad lustre~/lustre/obdclass/lprocfs_status.c lustre/lustre/obdclass/lpro return rc; diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c --- lustre~/lustre/ptlrpc/service.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/ptlrpc/service.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/ptlrpc/service.c 2009-03-10 11:41:03.000000000 +0100 @@ -1268,7 +1268,7 @@ cfs_daemonize(name); exit_fs(cfs_current()); @@ -4000,7 +4039,7 @@ diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c static void diff -urNad lustre~/lustre/quota/quotacheck_test.c lustre/lustre/quota/quotacheck_test.c --- lustre~/lustre/quota/quotacheck_test.c 2008-12-30 11:23:32.000000000 +0100 -+++ lustre/lustre/quota/quotacheck_test.c 2009-03-09 15:40:21.000000000 +0100 ++++ lustre/lustre/quota/quotacheck_test.c 2009-03-10 11:41:03.000000000 +0100 @@ -97,7 +97,14 @@ if (ext3_test_bit(index, bitmap_bh->b_data)) { CERROR("i: %d, ino: %lu\n", index, ino); -- 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