From fea65fcd763e183998a6461615fad616c81f9b32 Mon Sep 17 00:00:00 2001 From: adilger Date: Tue, 5 Jul 2005 07:58:11 +0000 Subject: [PATCH] Branch b1_4 Move Lustre types.h replacement file to lustre/types.h so it is available for lustre_user.h if HAVE_ASM_TYPES_H isn't defined. b=4864 --- lustre/include/Makefile.am | 2 +- lustre/include/linux/lustre_fsfilt.h | 10 +++------- lustre/include/linux/lustre_idl.h | 2 +- lustre/include/linux/lustre_log.h | 8 ++++---- lustre/include/linux/lustre_quota.h | 2 +- lustre/include/lustre/Makefile.am | 4 ++-- lustre/include/lustre/lustre_user.h | 2 +- lustre/include/{ => lustre}/types.h | 0 lustre/tests/lov.sh | 8 ++++---- lustre/tests/test-framework.sh | 7 ++++--- 10 files changed, 21 insertions(+), 24 deletions(-) rename lustre/include/{ => lustre}/types.h (100%) diff --git a/lustre/include/Makefile.am b/lustre/include/Makefile.am index 0bd0712..00c4db7 100644 --- a/lustre/include/Makefile.am +++ b/lustre/include/Makefile.am @@ -5,5 +5,5 @@ # See the file COPYING in this distribution SUBDIRS = linux lustre -EXTRA_DIST = ioctl.h liblustre.h types.h +EXTRA_DIST = ioctl.h liblustre.h diff --git a/lustre/include/linux/lustre_fsfilt.h b/lustre/include/linux/lustre_fsfilt.h index 2cc850e..b82effc 100644 --- a/lustre/include/linux/lustre_fsfilt.h +++ b/lustre/include/linux/lustre_fsfilt.h @@ -155,8 +155,7 @@ static inline void *fsfilt_start(struct obd_device *obd, struct inode *inode, return fsfilt_start_log(obd, inode, op, oti, 0); } -static inline void *fsfilt_brw_start_log(struct obd_device *obd, - int objcount, +static inline void *fsfilt_brw_start_log(struct obd_device *obd, int objcount, struct fsfilt_objinfo *fso, int niocount, struct niobuf_local *nb, struct obd_trans_info *oti, int logs) @@ -351,11 +350,8 @@ static inline int fsfilt_map_inode_pages(struct obd_device *obd, created, create, sem); } -static inline int fs_prep_san_write(struct obd_device *obd, - struct inode *inode, - long *blocks, - int nblocks, - loff_t newsize) +static inline int fs_prep_san_write(struct obd_device *obd, struct inode *inode, + long *blocks, int nblocks, loff_t newsize) { return obd->obd_fsops->fs_prep_san_write(inode, blocks, nblocks, newsize); diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h index 406f4c5..a9eaa0f 100644 --- a/lustre/include/linux/lustre_idl.h +++ b/lustre/include/linux/lustre_idl.h @@ -36,7 +36,7 @@ #ifdef HAVE_ASM_TYPES_H #include #else -#include "types.h" +#include #endif #ifdef __KERNEL__ diff --git a/lustre/include/linux/lustre_log.h b/lustre/include/linux/lustre_log.h index 9864e5d..4cb00a5 100644 --- a/lustre/include/linux/lustre_log.h +++ b/lustre/include/linux/lustre_log.h @@ -76,14 +76,14 @@ struct llog_fill_rec_data { /* llog.c - general API */ typedef int (*llog_cb_t)(struct llog_handle *, struct llog_rec_hdr *, void *); typedef int (*llog_fill_rec_cb_t)(struct llog_rec_hdr *rec, void *data); +extern struct llog_handle *llog_alloc_handle(void); int llog_init_handle(struct llog_handle *handle, int flags, struct obd_uuid *uuid); +extern void llog_free_handle(struct llog_handle *handle); int llog_process(struct llog_handle *loghandle, llog_cb_t cb, void *data, void *catdata); -extern struct llog_handle *llog_alloc_handle(void); -extern void llog_free_handle(struct llog_handle *handle); -extern int llog_close(struct llog_handle *cathandle); extern int llog_cancel_rec(struct llog_handle *loghandle, int index); +extern int llog_close(struct llog_handle *cathandle); /* llog_cat.c - catalog api */ struct llog_process_data { @@ -229,7 +229,7 @@ static inline int llog_gen_lt(struct llog_gen a, struct llog_gen b) static inline int llog_obd2ops(struct llog_ctxt *ctxt, struct llog_operations **lop) { - if (ctxt == NULL) + if (ctxt == NULL) return -ENOTCONN; *lop = ctxt->loc_logops; diff --git a/lustre/include/linux/lustre_quota.h b/lustre/include/linux/lustre_quota.h index 6e0355a..a28c618 100644 --- a/lustre/include/linux/lustre_quota.h +++ b/lustre/include/linux/lustre_quota.h @@ -94,4 +94,4 @@ struct quotacheck_info { #define LL_DQUOT_OFF(sb) do {} while(0) #endif /*!HAVE_QUOTA_SUPPORT */ -#endif /* _LUSTRE_QUOTA_H */ +#endif /* _LUSTRE_QUOTA_H */ diff --git a/lustre/include/lustre/Makefile.am b/lustre/include/lustre/Makefile.am index 6faa7cd..1580bde 100644 --- a/lustre/include/lustre/Makefile.am +++ b/lustre/include/lustre/Makefile.am @@ -4,7 +4,7 @@ # See the file COPYING in this distribution if UTILS -pkginclude_HEADERS = lustre_user.h liblustreapi.h +pkginclude_HEADERS = lustre_user.h liblustreapi.h types.h endif -EXTRA_DIST = lustre_user.h liblustreapi.h +EXTRA_DIST = lustre_user.h liblustreapi.h types.h diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h index 2d1696a..079e23d 100644 --- a/lustre/include/lustre/lustre_user.h +++ b/lustre/include/lustre/lustre_user.h @@ -12,7 +12,7 @@ #ifdef HAVE_ASM_TYPES_H #include #else -#include "types.h" +#include #endif #ifdef HAVE_LINUX_QUOTA_H diff --git a/lustre/include/types.h b/lustre/include/lustre/types.h similarity index 100% rename from lustre/include/types.h rename to lustre/include/lustre/types.h diff --git a/lustre/tests/lov.sh b/lustre/tests/lov.sh index afbbfad..ec76b32 100755 --- a/lustre/tests/lov.sh +++ b/lustre/tests/lov.sh @@ -57,10 +57,10 @@ done if [ -z "$ECHO_CLIENT" ]; then # create client config - ${LMC} --add mtpt --node localhost --path $MOUNT --mds mds1 --lov lov1 \ - $CLIENTOPT || exit 40 - ${LMC} --add mtpt --node client --path $MOUNT2 --mds mds1 --lov lov1 \ - $CLIENTOPT || exit 41 + ${LMC} --add mtpt --node localhost --path $MOUNT \ + --mds mds1 --lov lov1 $CLIENTOPT || exit 40 + ${LMC} --add mtpt --node client --path $MOUNT2 \ + --mds mds1 --lov lov1 $CLIENTOPT || exit 41 else ${LMC} --add echo_client --node localhost --ost lov1 || exit 42 fi diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 39f08d8..771ce4d 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -518,9 +518,10 @@ pgcache_empty() { ################################## # Test interface error() { - echo "${TESTSUITE}: **** FAIL:" $@ - log "FAIL: $@" - exit 1 + sysctl -w lustre.fail_loc=0 + echo "${TESTSUITE}: **** FAIL:" $@ + log "FAIL: $@" + exit 1 } build_test_filter() { -- 1.8.3.1