[Pkg-lustre-svn-commit] updated: [7e42d21] Add missing #endif in patchless support patch
Patrick Winnertz
winnie at debian.org
Tue Dec 23 09:08:46 UTC 2008
The following commit has been merged in the master branch:
commit 7e42d21edf7287da1e5b7e0d46fcb44be55c9185
Author: Patrick Winnertz <winnie at debian.org>
Date: Tue Dec 23 10:08:00 2008 +0100
Add missing #endif in patchless support patch
diff --git a/debian/patches/patchless_support_2.6.24.dpatch b/debian/patches/patchless_support_2.6.24.dpatch
index 88c756a..fadc929 100755
--- a/debian/patches/patchless_support_2.6.24.dpatch
+++ b/debian/patches/patchless_support_2.6.24.dpatch
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lnet.m4
---- lustre~/lnet/autoconf/lustre-lnet.m4 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/autoconf/lustre-lnet.m4 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/autoconf/lustre-lnet.m4 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/autoconf/lustre-lnet.m4 2008-12-23 10:07:21.000000000 +0100
@@ -1290,6 +1290,41 @@
])
])
@@ -61,8 +61,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/include/libcfs/curproc.h 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/include/libcfs/curproc.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/include/libcfs/curproc.h 2008-12-23 10:07:21.000000000 +0100
@@ -72,6 +72,11 @@
*/
cfs_kernel_cap_t cfs_curproc_cap_get(void);
@@ -76,8 +76,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/include/libcfs/linux/linux-prim.h 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/include/libcfs/linux/linux-prim.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/include/libcfs/linux/linux-prim.h 2008-12-23 10:07:21.000000000 +0100
@@ -84,6 +84,17 @@
#endif
#define cfs_unregister_sysctl_table(t) unregister_sysctl_table(t)
@@ -97,8 +97,8 @@ diff -urNad lustre~/lnet/include/libcfs/linux/linux-prim.h lustre/lnet/include/l
* Symbol register
*/
diff -urNad lustre~/lnet/klnds/gmlnd/gmlnd_module.c lustre/lnet/klnds/gmlnd/gmlnd_module.c
---- lustre~/lnet/klnds/gmlnd/gmlnd_module.c 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/gmlnd/gmlnd_module.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/klnds/gmlnd/gmlnd_module.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/gmlnd/gmlnd_module.c 2008-12-23 10:07:21.000000000 +0100
@@ -78,9 +78,37 @@
};
@@ -202,8 +202,8 @@ diff -urNad lustre~/lnet/klnds/gmlnd/gmlnd_module.c lustre/lnet/klnds/gmlnd/gmln
.data = NULL,
.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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-12-23 10:07: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) */
@@ -383,8 +383,8 @@ diff -urNad lustre~/lnet/klnds/iiblnd/iiblnd_modparams.c lustre/lnet/klnds/iibln
.data = NULL,
.maxlen = 0,
diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd.h lustre/lnet/klnds/o2iblnd/o2iblnd.h
---- lustre~/lnet/klnds/o2iblnd/o2iblnd.h 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/o2iblnd/o2iblnd.h 2008-12-22 10:44:38.000000000 +0100
+--- lustre~/lnet/klnds/o2iblnd/o2iblnd.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/o2iblnd/o2iblnd.h 2008-12-23 10:07: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,
@@ -400,8 +400,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-12-23 10:07:21.000000000 +0100
@@ -643,9 +643,7 @@
fragnob = min((int)(iov->iov_len - offset), nob);
fragnob = min(fragnob, (int)PAGE_SIZE - page_offset);
@@ -429,8 +429,8 @@ diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd_cb.c lustre/lnet/klnds/o2iblnd/o2
kiov++;
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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2008-12-23 10:07:21.000000000 +0100
@@ -130,9 +130,51 @@
static char ipif_basename_space[32];
@@ -620,8 +620,8 @@ diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd_modparams.c lustre/lnet/klnds/o2i
.data = NULL,
.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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/openiblnd/openiblnd_modparams.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/klnds/openiblnd/openiblnd_modparams.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/openiblnd/openiblnd_modparams.c 2008-12-23 10:07:21.000000000 +0100
@@ -100,9 +100,42 @@
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -766,8 +766,8 @@ diff -urNad lustre~/lnet/klnds/openiblnd/openiblnd_modparams.c lustre/lnet/klnds
.data = NULL,
.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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-12-23 10:07:21.000000000 +0100
@@ -156,9 +156,54 @@
}
#endif
@@ -979,8 +979,8 @@ diff -urNad lustre~/lnet/klnds/ptllnd/ptllnd_modparams.c lustre/lnet/klnds/ptlln
.data = NULL,
.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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-12-23 10:07:21.000000000 +0100
@@ -87,9 +87,45 @@
};
@@ -1128,8 +1128,8 @@ diff -urNad lustre~/lnet/klnds/qswlnd/qswlnd_modparams.c lustre/lnet/klnds/qswln
.data = NULL,
.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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/ralnd/ralnd_modparams.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/klnds/ralnd/ralnd_modparams.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/ralnd/ralnd_modparams.c 2008-12-23 10:07:21.000000000 +0100
@@ -89,9 +89,37 @@
};
@@ -1251,8 +1251,8 @@ diff -urNad lustre~/lnet/klnds/ralnd/ralnd_modparams.c lustre/lnet/klnds/ralnd/r
.data = NULL,
.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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/socklnd/socklnd_lib-linux.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/klnds/socklnd/socklnd_lib-linux.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/socklnd/socklnd_lib-linux.c 2008-12-23 10:07:21.000000000 +0100
@@ -37,197 +37,244 @@
#include "socklnd.h"
@@ -1578,8 +1578,8 @@ diff -urNad lustre~/lnet/klnds/socklnd/socklnd_lib-linux.c lustre/lnet/klnds/soc
cfs_register_sysctl_table(ksocknal_top_ctl_table, 0);
diff -urNad lustre~/lnet/klnds/viblnd/viblnd_modparams.c lustre/lnet/klnds/viblnd/viblnd_modparams.c
---- lustre~/lnet/klnds/viblnd/viblnd_modparams.c 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/klnds/viblnd/viblnd_modparams.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/klnds/viblnd/viblnd_modparams.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/klnds/viblnd/viblnd_modparams.c 2008-12-23 10:07:21.000000000 +0100
@@ -142,6 +142,56 @@
#endif
};
@@ -1818,8 +1818,8 @@ diff -urNad lustre~/lnet/klnds/viblnd/viblnd_modparams.c lustre/lnet/klnds/vibln
.data = NULL,
.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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/libcfs/linux/linux-curproc.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/libcfs/linux/linux-curproc.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/libcfs/linux/linux-curproc.c 2008-12-23 10:07:21.000000000 +0100
@@ -131,6 +131,19 @@
current->cap_effective = cap;
}
@@ -1850,8 +1850,8 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-curproc.c lustre/lnet/libcfs/linux/l
* Local variables:
* 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/libcfs/linux/linux-proc.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/libcfs/linux/linux-proc.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/libcfs/linux/linux-proc.c 2008-12-23 10:07:21.000000000 +0100
@@ -79,7 +79,8 @@
static cfs_sysctl_table_header_t *lnet_table_header = NULL;
extern char lnet_upcall[1024];
@@ -2095,8 +2095,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lnet/lnet/router_proc.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lnet/lnet/router_proc.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lnet/lnet/router_proc.c 2008-12-23 10:07:21.000000000 +0100
@@ -32,12 +32,13 @@
/* this is really lnet_proc.c */
@@ -2139,8 +2139,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/autoconf/lustre-core.m4 2008-12-22 10:51:42.000000000 +0100
+--- lustre~/lustre/autoconf/lustre-core.m4 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/autoconf/lustre-core.m4 2008-12-23 10:07:21.000000000 +0100
@@ -1105,20 +1105,79 @@
])
])
@@ -2423,8 +2423,8 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
AC_MSG_RESULT([no])
])
diff -urNad lustre~/lustre/include/liblustre.h lustre/lustre/include/liblustre.h
---- lustre~/lustre/include/liblustre.h 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/include/liblustre.h 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/include/liblustre.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/include/liblustre.h 2008-12-23 10:07:21.000000000 +0100
@@ -743,11 +743,13 @@
struct _cap_struct;
typedef struct _cap_struct *cap_t;
@@ -2475,8 +2475,8 @@ diff -urNad lustre~/lustre/include/liblustre.h lustre/lustre/include/liblustre.h
const int l){}
diff -urNad lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include/linux/lustre_compat25.h
---- lustre~/lustre/include/linux/lustre_compat25.h 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/include/linux/lustre_compat25.h 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/include/linux/lustre_compat25.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/include/linux/lustre_compat25.h 2008-12-23 10:07:21.000000000 +0100
@@ -57,6 +57,28 @@
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */
@@ -2572,8 +2572,8 @@ diff -urNad lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include
#endif /* __KERNEL__ */
#endif /* _COMPAT25_H */
diff -urNad lustre~/lustre/include/linux/lvfs.h lustre/lustre/include/linux/lvfs.h
---- lustre~/lustre/include/linux/lvfs.h 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/include/linux/lvfs.h 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/include/linux/lvfs.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/include/linux/lvfs.h 2008-12-23 10:07:21.000000000 +0100
@@ -64,7 +64,7 @@
struct upcall_cache_entry *luc_uce;
__u32 luc_fsuid;
@@ -2584,8 +2584,8 @@ diff -urNad lustre~/lustre/include/linux/lvfs.h lustre/lustre/include/linux/lvfs
__u32 luc_suppgid2;
__u32 luc_umask;
diff -urNad lustre~/lustre/include/lprocfs_status.h lustre/lustre/include/lprocfs_status.h
---- lustre~/lustre/include/lprocfs_status.h 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/include/lprocfs_status.h 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/include/lprocfs_status.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/include/lprocfs_status.h 2008-12-23 10:07:21.000000000 +0100
@@ -509,6 +509,8 @@
#define LPROCFS_EXIT() do { \
up_read(&_lprocfs_lock); \
@@ -2610,8 +2610,8 @@ diff -urNad lustre~/lustre/include/lprocfs_status.h lustre/lustre/include/lprocf
/* You must use these macros when you want to refer to
* the import in a client obd_device for a lprocfs entry */
diff -urNad lustre~/lustre/include/lustre_log.h lustre/lustre/include/lustre_log.h
---- lustre~/lustre/include/lustre_log.h 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/include/lustre_log.h 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/include/lustre_log.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/include/lustre_log.h 2008-12-23 10:07:21.000000000 +0100
@@ -238,14 +238,6 @@
void *llog_proc_cb;
};
@@ -2673,8 +2673,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/include/lustre_mds.h 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/include/lustre_mds.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/include/lustre_mds.h 2008-12-23 10:07: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 2008-12-22 10:43:30.000000000 +0100
-+++ lustre/lustre/llite/file.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/llite/file.c 2008-12-23 10:07:20.000000000 +0100
++++ lustre/lustre/llite/file.c 2008-12-23 10:07:21.000000000 +0100
@@ -1820,9 +1820,17 @@
/*
* Send file content (through pagecache) somewhere with helper
@@ -2801,8 +2801,8 @@ diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
#endif
.fsync = ll_fsync,
diff -urNad lustre~/lustre/llite/llite_internal.h lustre/lustre/llite/llite_internal.h
---- lustre~/lustre/llite/llite_internal.h 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/llite/llite_internal.h 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/llite/llite_internal.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/llite/llite_internal.h 2008-12-23 10:07:21.000000000 +0100
@@ -748,9 +748,6 @@
/* llite/llite_nfs.c */
extern struct export_operations lustre_export_operations;
@@ -2814,8 +2814,8 @@ diff -urNad lustre~/lustre/llite/llite_internal.h lustre/lustre/llite/llite_inte
/* llite/special.c */
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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/llite/llite_lib.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/llite/llite_lib.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/llite/llite_lib.c 2008-12-23 10:07:21.000000000 +0100
@@ -1373,7 +1373,7 @@
rc = vmtruncate(inode, new_size);
clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -2826,8 +2826,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/llite/llite_mmap.c 2008-12-22 11:45:45.000000000 +0100
+--- lustre~/lustre/llite/llite_mmap.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/llite/llite_mmap.c 2008-12-23 10:07:43.000000000 +0100
@@ -53,9 +53,6 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -3051,7 +3051,15 @@ diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c
#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
-@@ -591,10 +620,13 @@
+@@ -565,6 +594,7 @@
+ 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)
+@@ -591,10 +621,14 @@
}
static struct vm_operations_struct ll_file_vm_ops = {
@@ -3063,10 +3071,11 @@ diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c
+ .fault = ll_fault,
+#else
+ .nopage = ll_nopage,
++#endif
};
int ll_file_mmap(struct file * file, struct vm_area_struct * vma)
-@@ -605,8 +637,7 @@
+@@ -605,8 +639,7 @@
ll_stats_ops_tally(ll_i2sbi(file->f_dentry->d_inode), LPROC_LL_MAP, 1);
rc = generic_file_mmap(file, vma);
if (rc == 0) {
@@ -3077,8 +3086,8 @@ diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c
filemap_populate = vma->vm_ops->populate;
#endif
diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c
---- lustre~/lustre/llite/llite_nfs.c 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/llite/llite_nfs.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/llite/llite_nfs.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/llite/llite_nfs.c 2008-12-23 10:07:21.000000000 +0100
@@ -57,11 +57,7 @@
return (key0 << 1);
}
@@ -3354,8 +3363,8 @@ diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c
+ .get_parent = ll_get_parent,
+};
diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c
---- lustre~/lustre/llite/lloop.c 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/llite/lloop.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/llite/lloop.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/llite/lloop.c 2008-12-23 10:07:21.000000000 +0100
@@ -312,7 +312,7 @@
if (atomic_dec_and_test(&lo->lo_pending))
up(&lo->lo_bh_mutex);
@@ -3375,8 +3384,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/llite/namei.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/llite/namei.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/llite/namei.c 2008-12-23 10:07:21.000000000 +0100
@@ -901,7 +901,7 @@
err = mdc_create(sbi->ll_mdc_exp, &op_data, tgt, tgt_len,
@@ -3387,8 +3396,8 @@ 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 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/llite/rw.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/llite/rw.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/llite/rw.c 2008-12-23 10:07:21.000000000 +0100
@@ -186,7 +186,7 @@
GOTO(out_unlock, 0);
}
@@ -3399,8 +3408,8 @@ diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c
if (!srvlock) {
struct ost_lvb lvb;
diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c
---- lustre~/lustre/llite/symlink.c 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/llite/symlink.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/llite/symlink.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/llite/symlink.c 2008-12-23 10:07:21.000000000 +0100
@@ -171,8 +171,12 @@
rc = ll_readlink_internal(inode, &request, &symname);
up(&lli->lli_size_sem);
@@ -3415,8 +3424,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/lvfs/lvfs_linux.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/lvfs/lvfs_linux.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/lvfs/lvfs_linux.c 2008-12-23 10:07:21.000000000 +0100
@@ -148,10 +148,10 @@
*/
@@ -3470,8 +3479,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/mdc/mdc_internal.h 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/mdc/mdc_internal.h 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/mdc/mdc_internal.h 2008-12-23 10:07:21.000000000 +0100
@@ -60,7 +60,7 @@
void *ea2, int ea2len);
void mdc_create_pack(struct ptlrpc_request *req, int offset,
@@ -3482,8 +3491,8 @@ diff -urNad lustre~/lustre/mdc/mdc_internal.h lustre/lustre/mdc/mdc_internal.h
void mdc_open_pack(struct ptlrpc_request *req, int offset,
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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/mdc/mdc_lib.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/mdc/mdc_lib.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/mdc/mdc_lib.c 2008-12-23 10:07:21.000000000 +0100
@@ -58,7 +58,7 @@
b = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*b));
b->fsuid = current->fsuid;
@@ -3575,8 +3584,8 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
b->flags = flags | MDS_BFLAG_EXT_FLAGS;
/* 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/mdc/mdc_reint.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/mdc/mdc_reint.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/mdc/mdc_reint.c 2008-12-23 10:07:21.000000000 +0100
@@ -176,7 +176,7 @@
int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
@@ -3587,8 +3596,8 @@ diff -urNad lustre~/lustre/mdc/mdc_reint.c lustre/lustre/mdc/mdc_reint.c
CFS_LIST_HEAD(cancels);
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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/mgc/mgc_request.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/mgc/mgc_request.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/mgc/mgc_request.c 2008-12-23 10:07:21.000000000 +0100
@@ -410,7 +410,7 @@
obd->obd_lvfs_ctxt.fs = get_ds();
@@ -3599,8 +3608,8 @@ diff -urNad lustre~/lustre/mgc/mgc_request.c lustre/lustre/mgc/mgc_request.c
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/obdclass/linux/linux-module.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/obdclass/linux/linux-module.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/obdclass/linux/linux-module.c 2008-12-23 10:07:21.000000000 +0100
@@ -418,7 +418,7 @@
ENTRY;
@@ -3611,8 +3620,8 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-module.c lustre/lustre/obdclass/
printk(KERN_ERR
"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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/obdclass/linux/linux-sysctl.c 2008-12-22 12:38:41.000000000 +0100
+--- lustre~/lustre/obdclass/linux/linux-sysctl.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/obdclass/linux/linux-sysctl.c 2008-12-23 10:07:21.000000000 +0100
@@ -59,7 +59,9 @@
cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -3922,8 +3931,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/obdclass/llog_obd.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/obdclass/llog_obd.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/obdclass/llog_obd.c 2008-12-23 10:07:21.000000000 +0100
@@ -203,7 +203,7 @@
struct lov_stripe_md *lsm, struct llog_cookie *logcookies,
int numcookies)
@@ -3947,8 +3956,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/obdclass/lprocfs_status.c 2008-12-22 11:46:48.000000000 +0100
+--- lustre~/lustre/obdclass/lprocfs_status.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/obdclass/lprocfs_status.c 2008-12-23 10:07:21.000000000 +0100
@@ -132,6 +132,8 @@
proc->read_proc = read_proc;
proc->write_proc = write_proc;
@@ -3977,8 +3986,8 @@ diff -urNad lustre~/lustre/obdclass/lprocfs_status.c lustre/lustre/obdclass/lpro
LPROCFS_EXIT();
return rc;
diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c
---- lustre~/lustre/ptlrpc/service.c 2008-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/ptlrpc/service.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/ptlrpc/service.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/ptlrpc/service.c 2008-12-23 10:07:21.000000000 +0100
@@ -1268,7 +1268,7 @@
cfs_daemonize(name);
exit_fs(cfs_current());
@@ -3989,8 +3998,8 @@ 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-11-25 13:59:37.000000000 +0100
-+++ lustre/lustre/quota/quotacheck_test.c 2008-12-22 10:43:33.000000000 +0100
+--- lustre~/lustre/quota/quotacheck_test.c 2008-12-23 09:56:31.000000000 +0100
++++ lustre/lustre/quota/quotacheck_test.c 2008-12-23 10:07: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
More information about the Pkg-lustre-svn-commit
mailing list