From 17ad0ce6058df4a3d85024e86ce554ff1f559cbb Mon Sep 17 00:00:00 2001 From: Shraddha Barke Date: Thu, 8 Oct 2015 01:36:04 +0530 Subject: [PATCH] Staging: lustre: obdclass: llog_cat: Declare local functions as static Declare llog_cat_id2handle and llog_cat_process_or_fork as static since they are used only in this particular file. Also remove the corresponding declarations from header files. Signed-off-by: Shraddha Barke Reviewed-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- .../staging/lustre/lustre/include/lustre_log.h | 3 --- drivers/staging/lustre/lustre/obdclass/llog_cat.c | 15 ++++++++------- .../lustre/lustre/obdclass/llog_internal.h | 2 -- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/lustre_log.h b/drivers/staging/lustre/lustre/include/lustre_log.h index 958d012a4388..5d3b2df02321 100644 --- a/drivers/staging/lustre/lustre/include/lustre_log.h +++ b/drivers/staging/lustre/lustre/include/lustre_log.h @@ -165,9 +165,6 @@ struct llog_process_cat_data { struct thandle; int llog_cat_close(const struct lu_env *env, struct llog_handle *cathandle); -int llog_cat_process_or_fork(const struct lu_env *env, - struct llog_handle *cat_llh, llog_cb_t cb, - void *data, int startcat, int startidx, bool fork); int llog_cat_process(const struct lu_env *env, struct llog_handle *cat_llh, llog_cb_t cb, void *data, int startcat, int startidx); diff --git a/drivers/staging/lustre/lustre/obdclass/llog_cat.c b/drivers/staging/lustre/lustre/obdclass/llog_cat.c index 3984445f8442..c63b720172b4 100644 --- a/drivers/staging/lustre/lustre/obdclass/llog_cat.c +++ b/drivers/staging/lustre/lustre/obdclass/llog_cat.c @@ -62,8 +62,10 @@ * This takes extra reference on llog_handle via llog_handle_get() and require * this reference to be put by caller using llog_handle_put() */ -int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle, - struct llog_handle **res, struct llog_logid *logid) +static int llog_cat_id2handle(const struct lu_env *env, + struct llog_handle *cathandle, + struct llog_handle **res, + struct llog_logid *logid) { struct llog_handle *loghandle; int rc = 0; @@ -189,10 +191,10 @@ static int llog_cat_process_cb(const struct lu_env *env, return rc; } -int llog_cat_process_or_fork(const struct lu_env *env, - struct llog_handle *cat_llh, - llog_cb_t cb, void *data, int startcat, - int startidx, bool fork) +static int llog_cat_process_or_fork(const struct lu_env *env, + struct llog_handle *cat_llh, + llog_cb_t cb, void *data, int startcat, + int startidx, bool fork) { struct llog_process_data d; struct llog_log_hdr *llh = cat_llh->lgh_hdr; @@ -228,7 +230,6 @@ int llog_cat_process_or_fork(const struct lu_env *env, return rc; } -EXPORT_SYMBOL(llog_cat_process_or_fork); int llog_cat_process(const struct lu_env *env, struct llog_handle *cat_llh, llog_cb_t cb, void *data, int startcat, int startidx) diff --git a/drivers/staging/lustre/lustre/obdclass/llog_internal.h b/drivers/staging/lustre/lustre/obdclass/llog_internal.h index 5dff6170876f..b9fe4b01c690 100644 --- a/drivers/staging/lustre/lustre/obdclass/llog_internal.h +++ b/drivers/staging/lustre/lustre/obdclass/llog_internal.h @@ -66,8 +66,6 @@ void llog_info_fini(void); void llog_handle_get(struct llog_handle *loghandle); void llog_handle_put(struct llog_handle *loghandle); -int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle, - struct llog_handle **res, struct llog_logid *logid); int class_config_dump_handler(const struct lu_env *env, struct llog_handle *handle, struct llog_rec_hdr *rec, void *data); -- 2.20.1