The following commit has been merged in the master branch: commit 129dd3d17532d4b5484aab1ff8d05d5004a64e32 Author: Patrick Winnertz <win...@debian.org> Date: Mon Mar 9 15:46:11 2009 +0100
Move LPROCFS_ENTRY_WRITE and LPROCFS_ENTRY_EXIT out of #ifdef in lprocfs_status.h 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 71a8fd7..7ae3d95 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 14:01:34.000000000 +0100 ++++ lustre/lnet/autoconf/lustre-lnet.m4 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/include/libcfs/curproc.h 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/include/libcfs/linux/linux-prim.h 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/gmlnd/gmlnd_module.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/iiblnd/iiblnd_modparams.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/o2iblnd/o2iblnd.h 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/openiblnd/openiblnd_modparams.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/ptllnd/ptllnd_modparams.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/qswlnd/qswlnd_modparams.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/ralnd/ralnd_modparams.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/socklnd/socklnd_lib-linux.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/klnds/viblnd/viblnd_modparams.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/libcfs/linux/linux-curproc.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/libcfs/linux/linux-proc.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lnet/lnet/router_proc.c 2009-03-09 15:40:21.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 14:01:34.000000000 +0100 ++++ lustre/lustre/autoconf/lustre-core.m4 2009-03-09 15:40:21.000000000 +0100 @@ -1105,20 +1105,79 @@ ]) ]) @@ -2424,7 +2424,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 14:01:34.000000000 +0100 ++++ lustre/lustre/include/liblustre.h 2009-03-09 15:40:21.000000000 +0100 @@ -743,11 +743,13 @@ struct _cap_struct; typedef struct _cap_struct *cap_t; @@ -2476,7 +2476,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 14:01:34.000000000 +0100 ++++ lustre/lustre/include/linux/lustre_compat25.h 2009-03-09 15:40:21.000000000 +0100 @@ -57,6 +57,28 @@ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */ @@ -2573,7 +2573,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 14:01:34.000000000 +0100 ++++ lustre/lustre/include/linux/lvfs.h 2009-03-09 15:40:21.000000000 +0100 @@ -64,7 +64,7 @@ struct upcall_cache_entry *luc_uce; __u32 luc_fsuid; @@ -2585,7 +2585,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 14:01:34.000000000 +0100 ++++ lustre/lustre/include/lprocfs_status.h 2009-03-09 15:45:14.000000000 +0100 @@ -509,6 +509,8 @@ #define LPROCFS_EXIT() do { \ up_read(&_lprocfs_lock); \ @@ -2595,9 +2595,9 @@ diff -urNad lustre~/lustre/include/lprocfs_status.h lustre/lustre/include/lprocf #define LPROCFS_ENTRY_AND_CHECK(dp) do { \ typecheck(struct proc_dir_entry *, dp); \ LPROCFS_ENTRY(); \ -@@ -523,6 +525,13 @@ - #define LPROCFS_WRITE_EXIT() do { \ - up_write(&_lprocfs_lock); \ +@@ -517,6 +519,13 @@ + return -ENODEV; \ + } \ } while(0) +#define LPROCFS_CHECK_DELETED(dp) ((dp)->deleted) +#else @@ -2606,12 +2606,12 @@ diff -urNad lustre~/lustre/include/lprocfs_status.h lustre/lustre/include/lprocf +#define LPROCFS_CHECK_DELETED(dp) (0) +#endif + - - /* You must use these macros when you want to refer to - * the import in a client obd_device for a lprocfs entry */ + #define LPROCFS_WRITE_ENTRY() do { \ + down_write(&_lprocfs_lock); \ + } 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 14:01:34.000000000 +0100 ++++ lustre/lustre/include/lustre_log.h 2009-03-09 15:40:21.000000000 +0100 @@ -238,14 +238,6 @@ void *llog_proc_cb; }; @@ -2674,7 +2674,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 14:01:34.000000000 +0100 ++++ lustre/lustre/include/lustre_mds.h 2009-03-09 15:40:21.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 +2685,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 14:01:34.000000000 +0100 -+++ lustre/lustre/llite/file.c 2009-03-09 14:01:34.000000000 +0100 +--- 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 @@ -1820,9 +1820,17 @@ /* * Send file content (through pagecache) somewhere with helper @@ -2802,7 +2802,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 14:01:34.000000000 +0100 ++++ lustre/lustre/llite/llite_internal.h 2009-03-09 15:40:21.000000000 +0100 @@ -748,9 +748,6 @@ /* llite/llite_nfs.c */ extern struct export_operations lustre_export_operations; @@ -2815,7 +2815,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 14:01:34.000000000 +0100 ++++ lustre/lustre/llite/llite_lib.c 2009-03-09 15:40:21.000000000 +0100 @@ -1373,7 +1373,7 @@ rc = vmtruncate(inode, new_size); clear_bit(LLI_F_SRVLOCK, &lli->lli_flags); @@ -2827,7 +2827,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 14:02:33.000000000 +0100 ++++ lustre/lustre/llite/llite_mmap.c 2009-03-09 15:40:21.000000000 +0100 @@ -53,9 +53,6 @@ #include <linux/mm.h> #include <linux/pagemap.h> @@ -3085,666 +3085,9 @@ diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c if (!filemap_populate) filemap_populate = vma->vm_ops->populate; #endif -diff -urNad lustre~/lustre/llite/llite_mmap.c~ lustre/lustre/llite/llite_mmap.c~ ---- lustre~/lustre/llite/llite_mmap.c~ 1970-01-01 00:00:00.000000000 +0000 -+++ lustre/lustre/llite/llite_mmap.c~ 2009-03-09 14:01:34.000000000 +0100 -@@ -0,0 +1,653 @@ -+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- -+ * vim:expandtab:shiftwidth=8:tabstop=8: -+ * -+ * GPL HEADER START -+ * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 only, -+ * as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License version 2 for more details (a copy is included -+ * in the LICENSE file that accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License -+ * version 2 along with this program; If not, see -+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ * -+ * GPL HEADER END -+ */ -+/* -+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved -+ * Use is subject to license terms. -+ */ -+/* -+ * This file is part of Lustre, http://www.lustre.org/ -+ * Lustre is a trademark of Sun Microsystems, Inc. -+ */ -+#ifndef AUTOCONF_INCLUDED -+#include <linux/config.h> -+#endif -+#include <linux/kernel.h> -+#include <linux/mm.h> -+#include <linux/string.h> -+#include <linux/stat.h> -+#include <linux/errno.h> -+#include <linux/smp_lock.h> -+#include <linux/unistd.h> -+#include <linux/version.h> -+#include <asm/system.h> -+#include <asm/uaccess.h> -+ -+#include <linux/fs.h> -+#include <linux/stat.h> -+#include <asm/uaccess.h> -+#include <linux/mm.h> -+#include <linux/pagemap.h> -+#include <linux/smp_lock.h> -+ -+#define DEBUG_SUBSYSTEM S_LLITE -+ -+#include <lustre_lite.h> -+#include "llite_internal.h" -+#include <linux/lustre_compat25.h> -+ -+#define VMA_DEBUG(vma, fmt, arg...) \ -+ CDEBUG(D_MMAP, "vma(%p) start(%ld) end(%ld) pgoff(%ld) inode(%p) " \ -+ "ino(%lu) iname(%s): " fmt, vma, vma->vm_start, vma->vm_end, \ -+ vma->vm_pgoff, vma->vm_file->f_dentry->d_inode, \ -+ vma->vm_file->f_dentry->d_inode->i_ino, \ -+ vma->vm_file->f_dentry->d_iname, ## arg); \ -+ -+ -+struct ll_lock_tree_node { -+ rb_node_t lt_node; -+ struct list_head lt_locked_item; -+ __u64 lt_oid; -+ ldlm_policy_data_t lt_policy; -+ struct lustre_handle lt_lockh; -+ ldlm_mode_t lt_mode; -+ struct inode *lt_inode; -+}; -+ -+int lt_get_mmap_locks(struct ll_lock_tree *tree, -+ unsigned long addr, size_t count); -+ -+static struct vm_operations_struct ll_file_vm_ops; -+ -+struct ll_lock_tree_node * ll_node_from_inode(struct inode *inode, __u64 start, -+ __u64 end, ldlm_mode_t mode) -+{ -+ struct ll_lock_tree_node *node; -+ -+ OBD_ALLOC(node, sizeof(*node)); -+ if (node == NULL) -+ RETURN(ERR_PTR(-ENOMEM)); -+ -+ node->lt_inode = inode; -+ node->lt_oid = ll_i2info(inode)->lli_smd->lsm_object_id; -+ node->lt_policy.l_extent.start = start; -+ node->lt_policy.l_extent.end = end; -+ memset(&node->lt_lockh, 0, sizeof(node->lt_lockh)); -+ INIT_LIST_HEAD(&node->lt_locked_item); -+ node->lt_mode = mode; -+ -+ return node; -+} -+ -+int lt_compare(struct ll_lock_tree_node *one, struct ll_lock_tree_node *two) -+{ -+ /* To avoid multiple fs deadlock */ -+ if (one->lt_inode->i_sb->s_dev < two->lt_inode->i_sb->s_dev) -+ return -1; -+ if (one->lt_inode->i_sb->s_dev > two->lt_inode->i_sb->s_dev) -+ return 1; -+ -+ if (one->lt_oid < two->lt_oid) -+ return -1; -+ if (one->lt_oid > two->lt_oid) -+ return 1; -+ -+ if (one->lt_policy.l_extent.end < two->lt_policy.l_extent.start) -+ return -1; -+ if (one->lt_policy.l_extent.start > two->lt_policy.l_extent.end) -+ return 1; -+ -+ return 0; /* they are the same object and overlap */ -+} -+ -+static void lt_merge(struct ll_lock_tree_node *dst, -+ struct ll_lock_tree_node *src) -+{ -+ dst->lt_policy.l_extent.start = min(dst->lt_policy.l_extent.start, -+ src->lt_policy.l_extent.start); -+ dst->lt_policy.l_extent.end = max(dst->lt_policy.l_extent.end, -+ src->lt_policy.l_extent.end); -+ -+ /* XXX could be a real call to the dlm to find superset modes */ -+ if (src->lt_mode == LCK_PW && dst->lt_mode != LCK_PW) -+ dst->lt_mode = LCK_PW; -+} -+ -+static void lt_insert(struct ll_lock_tree *tree, -+ struct ll_lock_tree_node *node) -+{ -+ struct ll_lock_tree_node *walk; -+ rb_node_t **p, *parent; -+ ENTRY; -+ -+restart: -+ p = &tree->lt_root.rb_node; -+ parent = NULL; -+ while (*p) { -+ parent = *p; -+ walk = rb_entry(parent, struct ll_lock_tree_node, lt_node); -+ switch (lt_compare(node, walk)) { -+ case -1: -+ p = &(*p)->rb_left; -+ break; -+ case 1: -+ p = &(*p)->rb_right; -+ break; -+ case 0: -+ lt_merge(node, walk); -+ rb_erase(&walk->lt_node, &tree->lt_root); -+ OBD_FREE(walk, sizeof(*walk)); -+ goto restart; -+ break; -+ default: -+ LBUG(); -+ break; -+ } -+ } -+ rb_link_node(&node->lt_node, parent, p); -+ rb_insert_color(&node->lt_node, &tree->lt_root); -+ EXIT; -+} -+ -+static struct ll_lock_tree_node *lt_least_node(struct ll_lock_tree *tree) -+{ -+ rb_node_t *rbnode; -+ struct ll_lock_tree_node *node = NULL; -+ -+ for ( rbnode = tree->lt_root.rb_node; rbnode != NULL; -+ rbnode = rbnode->rb_left) { -+ if (rbnode->rb_left == NULL) { -+ node = rb_entry(rbnode, struct ll_lock_tree_node, -+ lt_node); -+ break; -+ } -+ } -+ RETURN(node); -+} -+ -+int ll_tree_unlock(struct ll_lock_tree *tree) -+{ -+ struct ll_lock_tree_node *node; -+ struct list_head *pos, *n; -+ struct inode *inode; -+ int rc = 0; -+ ENTRY; -+ -+ list_for_each_safe(pos, n, &tree->lt_locked_list) { -+ node = list_entry(pos, struct ll_lock_tree_node, -+ lt_locked_item); -+ -+ inode = node->lt_inode; -+ rc = ll_extent_unlock(tree->lt_fd, inode, -+ ll_i2info(inode)->lli_smd, node->lt_mode, -+ &node->lt_lockh); -+ if (rc != 0) { -+ /* XXX better message */ -+ CERROR("couldn't unlock %d\n", rc); -+ } -+ list_del(&node->lt_locked_item); -+ OBD_FREE(node, sizeof(*node)); -+ } -+ -+ while ((node = lt_least_node(tree))) { -+ rb_erase(&node->lt_node, &tree->lt_root); -+ OBD_FREE(node, sizeof(*node)); -+ } -+ -+ RETURN(rc); -+} -+ -+int ll_tree_lock_iov(struct ll_lock_tree *tree, -+ struct ll_lock_tree_node *first_node, -+ const struct iovec *iov, unsigned long nr_segs, int ast_flags) -+{ -+ struct ll_lock_tree_node *node; -+ int rc = 0; -+ unsigned long seg; -+ ENTRY; -+ -+ tree->lt_root.rb_node = NULL; -+ INIT_LIST_HEAD(&tree->lt_locked_list); -+ if (first_node != NULL) -+ lt_insert(tree, first_node); -+ -+ /* To avoid such subtle deadlock case: client1 try to read file1 to -+ * mmapped file2, on the same time, client2 try to read file2 to -+ * mmapped file1.*/ -+ for (seg = 0; seg < nr_segs; seg++) { -+ const struct iovec *iv = &iov[seg]; -+ rc = lt_get_mmap_locks(tree, (unsigned long)iv->iov_base, -+ iv->iov_len); -+ if (rc) -+ GOTO(out, rc); -+ } -+ -+ while ((node = lt_least_node(tree))) { -+ struct inode *inode = node->lt_inode; -+ rc = ll_extent_lock(tree->lt_fd, inode, -+ ll_i2info(inode)->lli_smd, node->lt_mode, -+ &node->lt_policy, &node->lt_lockh, -+ ast_flags); -+ if (rc != 0) -+ GOTO(out, rc); -+ -+ rb_erase(&node->lt_node, &tree->lt_root); -+ list_add_tail(&node->lt_locked_item, &tree->lt_locked_list); -+ } -+ RETURN(rc); -+out: -+ ll_tree_unlock(tree); -+ RETURN(rc); -+} -+ -+int ll_tree_lock(struct ll_lock_tree *tree, -+ struct ll_lock_tree_node *first_node, -+ const char *buf, size_t count, int ast_flags) -+{ -+ struct iovec local_iov = { .iov_base = (void __user *)buf, -+ .iov_len = count }; -+ -+ return ll_tree_lock_iov(tree, first_node, &local_iov, 1, ast_flags); -+} -+ -+static ldlm_mode_t mode_from_vma(struct vm_area_struct *vma) -+{ -+ /* we only want to hold PW locks if the mmap() can generate -+ * writes back to the file and that only happens in shared -+ * writable vmas */ -+ if ((vma->vm_flags & VM_SHARED) && (vma->vm_flags & VM_WRITE)) -+ return LCK_PW; -+ return LCK_PR; -+} -+ -+static void policy_from_vma(ldlm_policy_data_t *policy, -+ struct vm_area_struct *vma, unsigned long addr, -+ size_t count) -+{ -+ policy->l_extent.start = ((addr - vma->vm_start) & CFS_PAGE_MASK) + -+ ((__u64)vma->vm_pgoff << CFS_PAGE_SHIFT); -+ policy->l_extent.end = (policy->l_extent.start + count - 1) | -+ ~CFS_PAGE_MASK; -+} -+ -+static struct vm_area_struct * our_vma(unsigned long addr, size_t count) -+{ -+ struct mm_struct *mm = current->mm; -+ struct vm_area_struct *vma, *ret = NULL; -+ ENTRY; -+ -+ /* No MM (e.g. NFS)? No vmas too. */ -+ if (!mm) -+ RETURN(NULL); -+ -+ spin_lock(&mm->page_table_lock); -+ for(vma = find_vma(mm, addr); -+ vma != NULL && vma->vm_start < (addr + count); vma = vma->vm_next) { -+ if (vma->vm_ops && vma->vm_ops == &ll_file_vm_ops && -+ vma->vm_flags & VM_SHARED) { -+ ret = vma; -+ break; -+ } -+ } -+ spin_unlock(&mm->page_table_lock); -+ RETURN(ret); -+} -+ -+int ll_region_mapped(unsigned long addr, size_t count) -+{ -+ return !!our_vma(addr, count); -+} -+ -+int lt_get_mmap_locks(struct ll_lock_tree *tree, -+ unsigned long addr, size_t count) -+{ -+ struct vm_area_struct *vma; -+ struct ll_lock_tree_node *node; -+ ldlm_policy_data_t policy; -+ struct inode *inode; -+ ENTRY; -+ -+ if (count == 0) -+ RETURN(0); -+ -+ /* we need to look up vmas on page aligned addresses */ -+ count += addr & (~CFS_PAGE_MASK); -+ addr &= CFS_PAGE_MASK; -+ -+ while ((vma = our_vma(addr, count)) != NULL) { -+ LASSERT(vma->vm_file); -+ -+ inode = vma->vm_file->f_dentry->d_inode; -+ policy_from_vma(&policy, vma, addr, count); -+ node = ll_node_from_inode(inode, policy.l_extent.start, -+ policy.l_extent.end, -+ mode_from_vma(vma)); -+ if (IS_ERR(node)) { -+ CERROR("not enough mem for lock_tree_node!\n"); -+ RETURN(-ENOMEM); -+ } -+ lt_insert(tree, node); -+ -+ if (vma->vm_end - addr >= count) -+ break; -+ count -= vma->vm_end - addr; -+ addr = vma->vm_end; -+ } -+ RETURN(0); -+} -+ -+ -+static int ll_get_extent_lock(struct vm_area_struct *vma, unsigned long pgoff, -+ int *save_flags, struct lustre_handle *lockh) -+{ -+ struct file *filp = vma->vm_file; -+ struct ll_file_data *fd = LUSTRE_FPRIVATE(filp); -+ struct inode *inode = filp->f_dentry->d_inode; -+ ldlm_policy_data_t policy; -+ ldlm_mode_t mode; -+ struct ll_inode_info *lli = ll_i2info(inode); -+ struct ost_lvb lvb; -+ __u64 kms, old_mtime; -+ unsigned long size; -+ -+ if (lli->lli_smd == NULL) { -+ CERROR("No lsm on fault?\n"); -+ RETURN(0); -+ } -+ -+ ll_clear_file_contended(inode); -+ -+ /* start and end the lock on the first and last bytes in the page */ -+ policy_from_vma(&policy, vma, pgoff, CFS_PAGE_SIZE); -+ -+ CDEBUG(D_MMAP, "nopage vma %p inode %lu, locking ["LPU64", "LPU64"]\n", -+ vma, inode->i_ino, policy.l_extent.start, policy.l_extent.end); -+ -+ mode = mode_from_vma(vma); -+ old_mtime = LTIME_S(inode->i_mtime); -+ -+ if(ll_extent_lock(fd, inode, lli->lli_smd, mode, &policy, -+ lockh, LDLM_FL_CBPENDING | LDLM_FL_NO_LRU)) -+ RETURN(0); -+ -+ if (vma->vm_flags & VM_EXEC && LTIME_S(inode->i_mtime) != old_mtime) -+ CWARN("binary changed. inode %lu\n", inode->i_ino); -+ -+ lov_stripe_lock(lli->lli_smd); -+ inode_init_lvb(inode, &lvb); -+ obd_merge_lvb(ll_i2obdexp(inode), lli->lli_smd, &lvb, 1); -+ kms = lvb.lvb_size; -+ -+ size = (kms + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT; -+ -+ if (pgoff >= size) { -+ lov_stripe_unlock(lli->lli_smd); -+ ll_glimpse_size(inode, LDLM_FL_BLOCK_GRANTED); -+ lov_stripe_lock(lli->lli_smd); -+ } else { -+ /* XXX change inode size without ll_inode_size_lock() held! -+ * there is a race condition with truncate path. (see -+ * ll_extent_lock) */ -+ /* XXX i_size_write() is not used because it is not safe to -+ * take the ll_inode_size_lock() due to a potential lock -+ * inversion (bug 6077). And since it's not safe to use -+ * i_size_write() without a covering mutex we do the -+ * assignment directly. It is not critical that the -+ * size be correct. */ -+ /* NOTE: region is within kms and, hence, within real file size (A). -+ * We need to increase i_size to cover the read region so that -+ * generic_file_read() will do its job, but that doesn't mean -+ * the kms size is _correct_, it is only the _minimum_ size. -+ * If someone does a stat they will get the correct size which -+ * will always be >= the kms value here. b=11081 */ -+ if (i_size_read(inode) < kms) { -+ inode->i_size = kms; -+ CDEBUG(D_INODE, "ino=%lu, updating i_size %llu\n", -+ inode->i_ino, i_size_read(inode)); -+ } -+ } -+ -+ /* If mapping is writeable, adjust kms to cover this page, -+ * but do not extend kms beyond actual file size. -+ * policy.l_extent.end is set to the end of the page by policy_from_vma -+ * bug 10919 */ -+ if (mode == LCK_PW) -+ obd_adjust_kms(ll_i2obdexp(inode), lli->lli_smd, -+ min_t(loff_t, policy.l_extent.end + 1, -+ i_size_read(inode)), 0); -+ lov_stripe_unlock(lli->lli_smd); -+ -+ /* disable VM_SEQ_READ and use VM_RAND_READ to make sure that -+ * the kernel will not read other pages not covered by ldlm in -+ * filemap_nopage. we do our readahead in ll_readpage. -+ */ -+ *save_flags = vma->vm_flags & (VM_RAND_READ | VM_SEQ_READ); -+ vma->vm_flags &= ~ VM_SEQ_READ; -+ vma->vm_flags |= VM_RAND_READ; -+ -+ RETURN(1); -+} -+ -+static void ll_put_extent_lock(struct vm_area_struct *vma, int save_flags, -+ struct lustre_handle *lockh) -+{ -+ struct file *filp = vma->vm_file; -+ struct ll_file_data *fd = LUSTRE_FPRIVATE(filp); -+ struct inode *inode = filp->f_dentry->d_inode; -+ ldlm_mode_t mode; -+ -+ mode = mode_from_vma(vma); -+ vma->vm_flags &= ~(VM_RAND_READ | VM_SEQ_READ); -+ vma->vm_flags |= save_flags; -+ -+ ll_extent_unlock(fd, inode, ll_i2info(inode)->lli_smd, mode, lockh); -+} -+ -+#ifndef HAVE_VM_OP_FAULT -+struct page *ll_nopage(struct vm_area_struct *vma, unsigned long address, -+ int *type) { -+ struct lustre_handle lockh = { 0 }; -+ int save_fags; -+ unsigned long pgoff; -+ struct page *page; -+ ENTRY; -+ -+ pgoff = ((address - vma->vm_start) >> CFS_PAGE_SHIFT) + vma->vm_pgoff; -+ if(!ll_get_extent_lock(vma, pgoff, &save_fags, &lockh)) -+ RETURN(NOPAGE_SIGBUS); -+ -+ -+ -+ page = filemap_nopage(vma, address, type); -+ if (page != NOPAGE_SIGBUS && page != NOPAGE_OOM) -+ LL_CDEBUG_PAGE(D_PAGE, page, "got addr %lu type %lx\n", address, -+ (long)type); -+ else -+ CDEBUG(D_PAGE, "got addr %lu type %lx - SIGBUS\n", address, -+ (long)type); -+ -+ ll_put_extent_lock(vma, save_fags, &lockh); -+ -+ RETURN(page); -+} -+#else -+/* New fault() API*/ -+int ll_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+{ -+ struct lustre_handle lockh = { 0 }; -+ int save_fags; -+ int rc; -+ ENTRY; -+ -+ if(!ll_get_extent_lock(vma, vmf->pgoff, &save_fags, &lockh)) -+ RETURN(VM_FAULT_SIGBUS); -+ -+ rc = filemap_fault(vma, vmf); -+ LL_CDEBUG_PAGE(D_PAGE, vmf->page, "got addr %p type NOPAGE\n", -+ vmf->virtual_address); -+ ll_put_extent_lock(vma, save_fags, &lockh); -+ -+ RETURN(rc); -+} -+#endif -+ -+/* To avoid cancel the locks covering mmapped region for lock cache pressure, -+ * we track the mapped vma count by lli_mmap_cnt. -+ * ll_vm_open(): when first vma is linked, split locks from lru. -+ * ll_vm_close(): when last vma is unlinked, join all this file's locks to lru. -+ * -+ * XXX we don't check the if the region of vma/lock for performance. -+ */ -+static void ll_vm_open(struct vm_area_struct * vma) -+{ -+ struct inode *inode = vma->vm_file->f_dentry->d_inode; -+ struct ll_inode_info *lli = ll_i2info(inode); -+ ENTRY; -+ -+ LASSERT(vma->vm_file); -+ -+ spin_lock(&lli->lli_lock); -+ LASSERT(atomic_read(&lli->lli_mmap_cnt) >= 0); -+ -+ atomic_inc(&lli->lli_mmap_cnt); -+ if (atomic_read(&lli->lli_mmap_cnt) == 1) { -+ struct lov_stripe_md *lsm = lli->lli_smd; -+ struct ll_sb_info *sbi = ll_i2sbi(inode); -+ int count; -+ -+ spin_unlock(&lli->lli_lock); -+ -+ if (!lsm) -+ return; -+ count = obd_join_lru(sbi->ll_osc_exp, lsm, 0); -+ VMA_DEBUG(vma, "split %d unused locks from lru\n", count); -+ } else { -+ spin_unlock(&lli->lli_lock); -+ } -+ -+} -+ -+static void ll_vm_close(struct vm_area_struct *vma) -+{ -+ struct inode *inode = vma->vm_file->f_dentry->d_inode; -+ struct ll_inode_info *lli = ll_i2info(inode); -+ ENTRY; -+ -+ LASSERT(vma->vm_file); -+ -+ spin_lock(&lli->lli_lock); -+ LASSERT(atomic_read(&lli->lli_mmap_cnt) > 0); -+ -+ atomic_dec(&lli->lli_mmap_cnt); -+ if (atomic_read(&lli->lli_mmap_cnt) == 0) { -+ struct lov_stripe_md *lsm = lli->lli_smd; -+ struct ll_sb_info *sbi = ll_i2sbi(inode); -+ int count; -+ -+ spin_unlock(&lli->lli_lock); -+ -+ if (!lsm) -+ return; -+ count = obd_join_lru(sbi->ll_osc_exp, lsm, 1); -+ VMA_DEBUG(vma, "join %d unused locks to lru\n", count); -+ } else { -+ spin_unlock(&lli->lli_lock); -+ } -+} -+ -+#ifndef HAVE_VM_OP_FAULT -+#ifndef HAVE_FILEMAP_POPULATE -+static int (*filemap_populate)(struct vm_area_struct * area, unsigned long address, unsigned long len, pgprot_t prot, unsigned long pgoff, int nonblock); -+#endif -+static int ll_populate(struct vm_area_struct *area, unsigned long address, -+ unsigned long len, pgprot_t prot, unsigned long pgoff, -+ int nonblock) -+{ -+ int rc = 0; -+ ENTRY; -+ -+ /* always set nonblock as true to avoid page read ahead */ -+ rc = filemap_populate(area, address, len, prot, pgoff, 1); -+ RETURN(rc); -+} -+#endif -+ -+/* return the user space pointer that maps to a file offset via a vma */ -+static inline unsigned long file_to_user(struct vm_area_struct *vma, __u64 byte) -+{ -+ return vma->vm_start + (byte - ((__u64)vma->vm_pgoff << CFS_PAGE_SHIFT)); -+ -+} -+ -+/* XXX put nice comment here. talk about __free_pte -> dirty pages and -+ * nopage's reference passing to the pte */ -+int ll_teardown_mmaps(struct address_space *mapping, __u64 first, __u64 last) -+{ -+ int rc = -ENOENT; -+ ENTRY; -+ -+ LASSERTF(last > first, "last "LPU64" first "LPU64"\n", last, first); -+ if (mapping_mapped(mapping)) { -+ rc = 0; -+ unmap_mapping_range(mapping, first + CFS_PAGE_SIZE - 1, -+ last - first + 1, 0); -+ } -+ -+ RETURN(rc); -+} -+ -+static struct vm_operations_struct ll_file_vm_ops = { -+ .open = ll_vm_open, -+ .close = ll_vm_close, -+ .populate = ll_populate, -+#ifdef HAVE_VM_OP_FAULT -+ .fault = ll_fault, -+#else -+ .nopage = ll_nopage, -+#endif -+}; -+ -+int ll_file_mmap(struct file * file, struct vm_area_struct * vma) -+{ -+ int rc; -+ ENTRY; -+ -+ ll_stats_ops_tally(ll_i2sbi(file->f_dentry->d_inode), LPROC_LL_MAP, 1); -+ rc = generic_file_mmap(file, vma); -+ if (rc == 0) { -+#if !defined(HAVE_FILEMAP_POPULATE) && !defined(HAVE_VM_OP_FAULT) -+ if (!filemap_populate) -+ filemap_populate = vma->vm_ops->populate; -+#endif -+ vma->vm_ops = &ll_file_vm_ops; -+ vma->vm_ops->open(vma); -+ /* update the inode's size and mtime */ -+ rc = ll_glimpse_size(file->f_dentry->d_inode, 0); -+ } -+ -+ RETURN(rc); -+} 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 14:01:34.000000000 +0100 ++++ lustre/lustre/llite/llite_nfs.c 2009-03-09 15:40:21.000000000 +0100 @@ -57,11 +57,7 @@ return (key0 << 1); } @@ -4021,7 +3364,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 14:01:34.000000000 +0100 ++++ lustre/lustre/llite/lloop.c 2009-03-09 15:40:21.000000000 +0100 @@ -312,7 +312,7 @@ if (atomic_dec_and_test(&lo->lo_pending)) up(&lo->lo_bh_mutex); @@ -4042,7 +3385,7 @@ diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c /* 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 14:01:34.000000000 +0100 ++++ lustre/lustre/llite/namei.c 2009-03-09 15:40:21.000000000 +0100 @@ -901,7 +901,7 @@ err = mdc_create(sbi->ll_mdc_exp, &op_data, tgt, tgt_len, @@ -4054,7 +3397,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 14:01:34.000000000 +0100 ++++ lustre/lustre/llite/rw.c 2009-03-09 15:40:21.000000000 +0100 @@ -186,7 +186,7 @@ GOTO(out_unlock, 0); } @@ -4066,7 +3409,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 14:01:34.000000000 +0100 ++++ lustre/lustre/llite/symlink.c 2009-03-09 15:40:21.000000000 +0100 @@ -171,8 +171,12 @@ rc = ll_readlink_internal(inode, &request, &symname); up(&lli->lli_size_sem); @@ -4082,7 +3425,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 14:01:34.000000000 +0100 ++++ lustre/lustre/lvfs/lvfs_linux.c 2009-03-09 15:40:21.000000000 +0100 @@ -148,10 +148,10 @@ */ @@ -4137,7 +3480,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 14:01:34.000000000 +0100 ++++ lustre/lustre/mdc/mdc_internal.h 2009-03-09 15:40:21.000000000 +0100 @@ -60,7 +60,7 @@ void *ea2, int ea2len); void mdc_create_pack(struct ptlrpc_request *req, int offset, @@ -4149,7 +3492,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 14:01:34.000000000 +0100 ++++ lustre/lustre/mdc/mdc_lib.c 2009-03-09 15:40:21.000000000 +0100 @@ -58,7 +58,7 @@ b = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*b)); b->fsuid = current->fsuid; @@ -4242,7 +3585,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 14:01:34.000000000 +0100 ++++ lustre/lustre/mdc/mdc_reint.c 2009-03-09 15:40:21.000000000 +0100 @@ -176,7 +176,7 @@ int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data, @@ -4254,7 +3597,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 14:01:34.000000000 +0100 ++++ lustre/lustre/mgc/mgc_request.c 2009-03-09 15:40:21.000000000 +0100 @@ -410,7 +410,7 @@ obd->obd_lvfs_ctxt.fs = get_ds(); @@ -4266,7 +3609,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 14:01:34.000000000 +0100 ++++ lustre/lustre/obdclass/linux/linux-module.c 2009-03-09 15:40:21.000000000 +0100 @@ -418,7 +418,7 @@ ENTRY; @@ -4278,7 +3621,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 14:01:34.000000000 +0100 ++++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-03-09 15:40:21.000000000 +0100 @@ -59,7 +59,9 @@ cfs_sysctl_table_header_t *obd_table_header = NULL; @@ -4590,7 +3933,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 14:01:34.000000000 +0100 ++++ lustre/lustre/obdclass/llog_obd.c 2009-03-09 15:40:21.000000000 +0100 @@ -203,7 +203,7 @@ struct lov_stripe_md *lsm, struct llog_cookie *logcookies, int numcookies) @@ -4615,7 +3958,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 14:01:34.000000000 +0100 ++++ lustre/lustre/obdclass/lprocfs_status.c 2009-03-09 15:45:40.000000000 +0100 @@ -132,6 +132,8 @@ proc->read_proc = read_proc; proc->write_proc = write_proc; @@ -4645,7 +3988,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 14:01:34.000000000 +0100 ++++ lustre/lustre/ptlrpc/service.c 2009-03-09 15:40:21.000000000 +0100 @@ -1268,7 +1268,7 @@ cfs_daemonize(name); exit_fs(cfs_current()); @@ -4657,7 +4000,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 14:01:34.000000000 +0100 ++++ lustre/lustre/quota/quotacheck_test.c 2009-03-09 15:40:21.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