From c55ebcd5fe9d7d2e0a46231d6032068c73df34c5 Mon Sep 17 00:00:00 2001 From: Filippos Giannakos Date: Wed, 26 Sep 2012 19:17:15 +0300 Subject: [PATCH] fix some build issues --- xseg/peers/user/mt-mapperd.c | 4 ++++ xseg/sys/kernel/_sysutil.h | 6 ++++++ xseg/sys/kernel/xsegmod.c | 13 +++++-------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/xseg/peers/user/mt-mapperd.c b/xseg/peers/user/mt-mapperd.c index e48dd89..0bd4af8 100644 --- a/xseg/peers/user/mt-mapperd.c +++ b/xseg/peers/user/mt-mapperd.c @@ -1371,6 +1371,10 @@ static int delete_object(struct peerd *peer, struct peer_req *pr, struct mapperd *mapper = __get_mapperd(peer); struct mapper_io *mio = __get_mapper_io(pr); + if (!(mn->flags && MF_OBJECT_EXIST)){ + //cant delete not existing object + + } if (xq_count(&mn->pending) != 0) { mio->delobj = mn->objectidx; __xq_append_tail(&mn->pending, (xqindex) pr); //FIXME err check diff --git a/xseg/sys/kernel/_sysutil.h b/xseg/sys/kernel/_sysutil.h index 7042642..d7b329b 100644 --- a/xseg/sys/kernel/_sysutil.h +++ b/xseg/sys/kernel/_sysutil.h @@ -6,4 +6,10 @@ #include #include +struct log_ctx { + void *logfile; + char *peer_name; + unsigned int log_level; +}; + #endif diff --git a/xseg/sys/kernel/xsegmod.c b/xseg/sys/kernel/xsegmod.c index 75a2a55..2c0cabb 100644 --- a/xseg/sys/kernel/xsegmod.c +++ b/xseg/sys/kernel/xsegmod.c @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -74,13 +75,7 @@ static void __exit xsegmod_exit(void) return; } -struct log_ctx { - void *logfile; - char *peer_name; - unsigned int log_level; -}; - -int kernel_init_logctx(struct log_ctx *lc, char *peer_name, unsigned int log_level, char *logfile) +int kernel_init_logctx(struct log_ctx *lc, char *peer_name, enum log_level log_level, char *logfile) { lc->peer_name = peer_name; lc->log_level = log_level; @@ -88,13 +83,14 @@ int kernel_init_logctx(struct log_ctx *lc, char *peer_name, unsigned int log_lev return 0; } int (*init_logctx)(struct log_ctx *lc, char *peer_name, enum log_level log_level, char *logfile) = kernel_init_logctx; +EXPORT_SYMBOL(init_logctx); void __xseg_log2(struct log_ctx *lc, unsigned int level, char *fmt, ...) { va_list ap; struct timeval t; struct tm broken; - char timebuf[1024], buffer[4096]; + char buffer[4096]; char *buf = buffer; char *type = NULL, *pn = NULL; @@ -124,6 +120,7 @@ void __xseg_log2(struct log_ctx *lc, unsigned int level, char *fmt, ...) return; } +EXPORT_SYMBOL(__xseg_log2); module_init(xsegmod_init); module_exit(xsegmod_exit); -- 1.7.10.4