From c3003c432904d2264ecec1139e97b27e1ad9c1ef Mon Sep 17 00:00:00 2001 From: mmex Date: Mon, 14 Jul 2003 22:22:28 +0000 Subject: [PATCH] - cleanup come of the configuration files to be more compatible and define some new things to help building rpms. --- lnet/archdep.m4 | 18 ++++++++++-- lnet/include/config.h.in | 58 +++++--------------------------------- lustre/obdfilter/filter_internal.h | 3 +- lustre/obdfilter/filter_log.c | 4 +-- lustre/portals/archdep.m4 | 18 ++++++++++-- lustre/portals/include/config.h.in | 58 +++++--------------------------------- 6 files changed, 48 insertions(+), 111 deletions(-) diff --git a/lnet/archdep.m4 b/lnet/archdep.m4 index 7a4e05c..0443ee6 100644 --- a/lnet/archdep.m4 +++ b/lnet/archdep.m4 @@ -160,21 +160,33 @@ if test $host_cpu != "lib" ; then AC_MSG_ERROR(** cannot find $LINUX/include/linux/autoconf.h. Run make config in $LINUX.) fi -# ------------ RELEASE and moduledir ------------------ +# ------------ LINUXRELEASE and moduledir ------------------ AC_MSG_CHECKING(for Linux release) dnl We need to rid ourselves of the nasty [ ] quotes. changequote(, ) dnl Get release from version.h - RELEASE="`sed -ne 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z_-]*\).*/\1/p' $LINUX/include/linux/version.h`" + LINUXRELEASE="`sed -ne 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z_-]*\).*/\1/p' $LINUX/include/linux/version.h`" changequote([, ]) - moduledir='$(libdir)/modules/'$RELEASE/kernel + moduledir='$(libdir)/modules/'$LINUXRELEASE/kernel AC_SUBST(moduledir) modulefsdir='$(moduledir)/fs/$(PACKAGE)' AC_SUBST(modulefsdir) + AC_MSG_RESULT($LINUXRELEASE) + AC_SUBST(LINUXRELEASE) + +# ------------ RELEASE -------------------------------- + AC_MSG_CHECKING(lustre release) + + dnl We need to rid ourselves of the nasty [ ] quotes. + changequote(, ) + dnl Get release from version.h + RELEASE="`sed -ne 's/-/_/g' -e 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z_]*\).*/\1/p' $LINUX/include/linux/version.h`_`date +%Y%m%d%H%M`" + changequote([, ]) + AC_MSG_RESULT($RELEASE) AC_SUBST(RELEASE) diff --git a/lnet/include/config.h.in b/lnet/include/config.h.in index 3aa6909..a4b1e1e 100644 --- a/lnet/include/config.h.in +++ b/lnet/include/config.h.in @@ -1,58 +1,14 @@ -/* portals/include/config.h.in. Generated from configure.in by autoheader. */ +/* portals/include/config.h.in. Generated automatically from configure.in by autoheader. */ -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* IOCTL Buffer Size */ -#undef OBD_MAX_IOCTL_BUFFER +/* The number of bytes in a unsigned long long. */ +#undef SIZEOF_UNSIGNED_LONG_LONG /* Name of package */ #undef PACKAGE -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* The size of a `unsigned long long', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG_LONG - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - /* Version number of package */ #undef VERSION + +/* IOCTL Buffer Size */ +#undef OBD_MAX_IOCTL_BUFFER + diff --git a/lustre/obdfilter/filter_internal.h b/lustre/obdfilter/filter_internal.h index c1d8427..e44e9a6 100644 --- a/lustre/obdfilter/filter_internal.h +++ b/lustre/obdfilter/filter_internal.h @@ -116,7 +116,8 @@ struct dentry *__filter_oa2dentry(struct obd_device *obd,struct obdo *oa, int filter_finish_transno(struct obd_export *, struct obd_trans_info *, int rc); __u64 filter_next_id(struct filter_obd *); -int filter_update_server_data(struct file *, struct filter_server_data *); +int filter_update_server_data(struct obd_device *, struct file *, + struct filter_server_data *); int filter_common_setup(struct obd_device *, obd_count len, void *buf, char *option); diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c index 790659d..8953722 100644 --- a/lustre/obdfilter/filter_log.c +++ b/lustre/obdfilter/filter_log.c @@ -192,7 +192,7 @@ static struct llog_handle *filter_log_create(struct obd_device *obd) GOTO(out_child, rc); } - rc = filter_update_server_data(filter->fo_rcvd_filp, filter->fo_fsd); + rc = filter_update_server_data(obd, filter->fo_rcvd_filp, filter->fo_fsd); if (rc) { CERROR("can't write lastobjid but log created: rc %d\n",rc); GOTO(out_destroy, rc); @@ -271,7 +271,7 @@ static struct llog_handle *filter_get_catalog(struct obd_device *obd) lgl = &cathandle->lgh_cookie.lgc_lgl; fsd->fsd_catalog_oid = cpu_to_le64(lgl->lgl_oid); fsd->fsd_catalog_ogen = cpu_to_le32(lgl->lgl_ogen); - rc = filter_update_server_data(filter->fo_rcvd_filp, fsd); + rc = filter_update_server_data(obd, filter->fo_rcvd_filp, fsd); if (rc) { CERROR("error writing new catalog to disk: rc %d\n",rc); GOTO(out_handle, rc); diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4 index 7a4e05c..0443ee6 100644 --- a/lustre/portals/archdep.m4 +++ b/lustre/portals/archdep.m4 @@ -160,21 +160,33 @@ if test $host_cpu != "lib" ; then AC_MSG_ERROR(** cannot find $LINUX/include/linux/autoconf.h. Run make config in $LINUX.) fi -# ------------ RELEASE and moduledir ------------------ +# ------------ LINUXRELEASE and moduledir ------------------ AC_MSG_CHECKING(for Linux release) dnl We need to rid ourselves of the nasty [ ] quotes. changequote(, ) dnl Get release from version.h - RELEASE="`sed -ne 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z_-]*\).*/\1/p' $LINUX/include/linux/version.h`" + LINUXRELEASE="`sed -ne 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z_-]*\).*/\1/p' $LINUX/include/linux/version.h`" changequote([, ]) - moduledir='$(libdir)/modules/'$RELEASE/kernel + moduledir='$(libdir)/modules/'$LINUXRELEASE/kernel AC_SUBST(moduledir) modulefsdir='$(moduledir)/fs/$(PACKAGE)' AC_SUBST(modulefsdir) + AC_MSG_RESULT($LINUXRELEASE) + AC_SUBST(LINUXRELEASE) + +# ------------ RELEASE -------------------------------- + AC_MSG_CHECKING(lustre release) + + dnl We need to rid ourselves of the nasty [ ] quotes. + changequote(, ) + dnl Get release from version.h + RELEASE="`sed -ne 's/-/_/g' -e 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z_]*\).*/\1/p' $LINUX/include/linux/version.h`_`date +%Y%m%d%H%M`" + changequote([, ]) + AC_MSG_RESULT($RELEASE) AC_SUBST(RELEASE) diff --git a/lustre/portals/include/config.h.in b/lustre/portals/include/config.h.in index 3aa6909..a4b1e1e 100644 --- a/lustre/portals/include/config.h.in +++ b/lustre/portals/include/config.h.in @@ -1,58 +1,14 @@ -/* portals/include/config.h.in. Generated from configure.in by autoheader. */ +/* portals/include/config.h.in. Generated automatically from configure.in by autoheader. */ -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* IOCTL Buffer Size */ -#undef OBD_MAX_IOCTL_BUFFER +/* The number of bytes in a unsigned long long. */ +#undef SIZEOF_UNSIGNED_LONG_LONG /* Name of package */ #undef PACKAGE -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* The size of a `unsigned long long', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG_LONG - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - /* Version number of package */ #undef VERSION + +/* IOCTL Buffer Size */ +#undef OBD_MAX_IOCTL_BUFFER + -- 1.8.3.1