From: Frank Zago Date: Fri, 9 Jan 2015 18:25:18 +0000 (-0600) Subject: LU-5829 obdclass: remove unnecessary EXPORT_SYMBOL X-Git-Tag: 2.6.94~26 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=adc9384fd11b7fb3b71b363c310c9fa7b37e469f;hp=34bdd30ec6a2010dfd98c5110487df210d03815d LU-5829 obdclass: remove unnecessary EXPORT_SYMBOL A lot of symbols don't need to be exported at all because they are only used in the module they belong to. Removed now unused function cat_cancel_cb() and fixed 3 comments in test code mentioning this function. Signed-off-by: frank zago Change-Id: Ia0fa1e8e65f197235c04997f56b49d8fd87d4fd6 Reviewed-on: http://review.whamcloud.com/13323 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Dmitry Eremin Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- diff --git a/lustre/obdclass/capa.c b/lustre/obdclass/capa.c index ee6da16..b3db16e 100644 --- a/lustre/obdclass/capa.c +++ b/lustre/obdclass/capa.c @@ -379,7 +379,6 @@ out: crypto_free_blkcipher(tfm); return rc; } -EXPORT_SYMBOL(capa_decrypt_id); void capa_cpy(void *capa, struct obd_capa *ocapa) { diff --git a/lustre/obdclass/cl_io.c b/lustre/obdclass/cl_io.c index 0740196..d885932 100644 --- a/lustre/obdclass/cl_io.c +++ b/lustre/obdclass/cl_io.c @@ -77,7 +77,6 @@ int cl_io_is_going(const struct lu_env *env) { return cl_env_info(env)->clt_current_io != NULL; } -EXPORT_SYMBOL(cl_io_is_going); /** * cl_io invariant that holds at all times when exported cl_io_*() functions @@ -507,7 +506,6 @@ void cl_io_rw_advance(const struct lu_env *env, struct cl_io *io, size_t nob) } EXIT; } -EXPORT_SYMBOL(cl_io_rw_advance); /** * Adds a lock to a lockset. @@ -790,7 +788,6 @@ int cl_io_cancel(const struct lu_env *env, struct cl_io *io, } return result; } -EXPORT_SYMBOL(cl_io_cancel); /** * Main io loop. @@ -1066,7 +1063,6 @@ int cl_page_list_own(const struct lu_env *env, } RETURN(result); } -EXPORT_SYMBOL(cl_page_list_own); /** * Assumes all pages in a queue. @@ -1081,7 +1077,6 @@ void cl_page_list_assume(const struct lu_env *env, cl_page_list_for_each(page, plist) cl_page_assume(env, io, page); } -EXPORT_SYMBOL(cl_page_list_assume); /** * Discards all pages in a queue. @@ -1097,7 +1092,6 @@ void cl_page_list_discard(const struct lu_env *env, struct cl_io *io, cl_page_discard(env, io, page); EXIT; } -EXPORT_SYMBOL(cl_page_list_discard); /** * Initialize dual page queue. @@ -1157,7 +1151,6 @@ void cl_2queue_assume(const struct lu_env *env, cl_page_list_assume(env, io, &queue->c2_qin); cl_page_list_assume(env, io, &queue->c2_qout); } -EXPORT_SYMBOL(cl_2queue_assume); /** * Finalize both page lists of a 2-queue. diff --git a/lustre/obdclass/cl_object.c b/lustre/obdclass/cl_object.c index eb23c9b..ad3f5ea 100644 --- a/lustre/obdclass/cl_object.c +++ b/lustre/obdclass/cl_object.c @@ -91,7 +91,6 @@ void cl_object_header_fini(struct cl_object_header *h) { lu_object_header_fini(&h->coh_lu); } -EXPORT_SYMBOL(cl_object_header_fini); /** * Returns a cl_object with a given \a fid. @@ -850,7 +849,6 @@ struct lu_env *cl_env_peek(int *refcheck) CDEBUG(D_OTHER, "%d@%p\n", cle ? cle->ce_ref : 0, cle); return env; } -EXPORT_SYMBOL(cl_env_peek); /** * Returns lu_env: if there already is an environment associated with the @@ -1085,7 +1083,6 @@ void cl_attr2lvb(struct ost_lvb *lvb, const struct cl_attr *attr) lvb->lvb_blocks = attr->cat_blocks; EXIT; } -EXPORT_SYMBOL(cl_attr2lvb); /** * Converts struct ost_lvb to struct cl_attr. diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c index 9a3b1607..b8639fd 100644 --- a/lustre/obdclass/cl_page.c +++ b/lustre/obdclass/cl_page.c @@ -218,7 +218,6 @@ struct cl_page *cl_page_alloc(const struct lu_env *env, } RETURN(page); } -EXPORT_SYMBOL(cl_page_alloc); /** * Returns a cl_page with index \a idx at the object \a o, and associated with @@ -1106,7 +1105,6 @@ int cl_page_cancel(const struct lu_env *env, struct cl_page *page) (const struct lu_env *, const struct cl_page_slice *)); } -EXPORT_SYMBOL(cl_page_cancel); /** * Converts a byte offset within object \a obj into a page index. diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index 41c3066..fe1dfc2 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -54,7 +54,6 @@ struct obd_device *obd_devs[MAX_OBD_DEVICES]; -EXPORT_SYMBOL(obd_devs); struct list_head obd_types; DEFINE_RWLOCK(obd_dev_lock); @@ -108,7 +107,6 @@ atomic_long_t obd_dirty_transit_pages; EXPORT_SYMBOL(obd_dirty_transit_pages); char obd_jobid_var[JOBSTATS_JOBID_VAR_MAX_LEN + 1] = JOBSTATS_DISABLE; -EXPORT_SYMBOL(obd_jobid_var); #ifdef CONFIG_PROC_FS struct lprocfs_stats *obd_memory = NULL; @@ -628,7 +626,6 @@ __u64 obd_memory_max(void) return ret; } -EXPORT_SYMBOL(obd_memory_max); __u64 obd_pages_max(void) { @@ -640,7 +637,6 @@ __u64 obd_pages_max(void) return ret; } -EXPORT_SYMBOL(obd_pages_max); #endif /* CONFIG_PROC_FS */ /* liblustre doesn't call cleanup_obdclass, apparently. we carry on in this diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c index c1179a4..41331c8 100644 --- a/lustre/obdclass/debug.c +++ b/lustre/obdclass/debug.c @@ -53,7 +53,6 @@ void dump_lniobuf(struct niobuf_local *nb) CDEBUG(D_RPCTRACE, "nb->page: index = %ld\n", nb->lnb_page ? page_index(nb->lnb_page) : -1); } -EXPORT_SYMBOL(dump_lniobuf); #define LPDS sizeof(__u64) int block_debug_setup(void *addr, int len, __u64 off, __u64 id) diff --git a/lustre/obdclass/dt_object.c b/lustre/obdclass/dt_object.c index fa38fdc..7a756f5 100644 --- a/lustre/obdclass/dt_object.c +++ b/lustre/obdclass/dt_object.c @@ -60,7 +60,6 @@ struct lu_context_key dt_key = { .lct_init = dt_global_key_init, .lct_fini = dt_global_key_fini }; -EXPORT_SYMBOL(dt_key); /* no lock is necessary to protect the list, because call-backs * are added during system startup. Please refer to "struct dt_device". @@ -320,7 +319,6 @@ dt_store_resolve(const struct lu_env *env, struct dt_device *dt, } return obj; } -EXPORT_SYMBOL(dt_store_resolve); static struct dt_object *dt_reg_open(const struct lu_env *env, struct dt_device *dt, @@ -365,7 +363,6 @@ struct dt_object *dt_store_open(const struct lu_env *env, } return file; } -EXPORT_SYMBOL(dt_store_open); struct dt_object *dt_find_or_create(const struct lu_env *env, struct dt_device *dt, diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c index 32875ba..d38619e 100644 --- a/lustre/obdclass/genops.c +++ b/lustre/obdclass/genops.c @@ -144,7 +144,6 @@ struct obd_type *class_get_type(const char *name) } return type; } -EXPORT_SYMBOL(class_get_type); void class_put_type(struct obd_type *type) { @@ -154,7 +153,6 @@ void class_put_type(struct obd_type *type) module_put(type->typ_dt_ops->o_owner); spin_unlock(&type->obd_type_lock); } -EXPORT_SYMBOL(class_put_type); #define CLASS_MAX_NAME 1024 @@ -419,7 +417,6 @@ int class_name2dev(const char *name) return -1; } -EXPORT_SYMBOL(class_name2dev); struct obd_device *class_name2obd(const char *name) { @@ -449,7 +446,6 @@ int class_uuid2dev(struct obd_uuid *uuid) return -1; } -EXPORT_SYMBOL(class_uuid2dev); struct obd_device *class_uuid2obd(struct obd_uuid *uuid) { @@ -487,7 +483,6 @@ struct obd_device *class_num2obd(int num) return obd; } -EXPORT_SYMBOL(class_num2obd); /** * Get obd devices count. Device in any @@ -748,7 +743,6 @@ struct obd_device *class_conn2obd(struct lustre_handle *conn) } return NULL; } -EXPORT_SYMBOL(class_conn2obd); struct obd_import *class_exp2cliimp(struct obd_export *exp) { @@ -766,7 +760,6 @@ struct obd_import *class_conn2cliimp(struct lustre_handle *conn) return NULL; return obd->u.cli.cl_import; } -EXPORT_SYMBOL(class_conn2cliimp); /* Export management functions */ static void class_export_destroy(struct obd_export *exp) @@ -948,7 +941,6 @@ void class_unlink_export(struct obd_export *exp) spin_unlock(&exp->exp_obd->obd_dev_lock); class_export_put(exp); } -EXPORT_SYMBOL(class_unlink_export); /* Import management functions */ static void class_import_destroy(struct obd_import *imp) @@ -1107,7 +1099,6 @@ void __class_export_add_lock_ref(struct obd_export *exp, struct ldlm_lock *lock) lock, exp, lock->l_exp_refs_nr); spin_unlock(&exp->exp_locks_list_guard); } -EXPORT_SYMBOL(__class_export_add_lock_ref); void __class_export_del_lock_ref(struct obd_export *exp, struct ldlm_lock *lock) { @@ -1126,7 +1117,6 @@ void __class_export_del_lock_ref(struct obd_export *exp, struct ldlm_lock *lock) lock, exp, lock->l_exp_refs_nr); spin_unlock(&exp->exp_locks_list_guard); } -EXPORT_SYMBOL(__class_export_del_lock_ref); #endif /* A connection defines an export context in which preallocation can @@ -1512,11 +1502,9 @@ int obd_export_evict_by_uuid(struct obd_device *obd, const char *uuid) return exports_evicted; } -EXPORT_SYMBOL(obd_export_evict_by_uuid); #if LUSTRE_TRACKS_LOCK_EXP_REFS void (*class_export_dump_hook)(struct obd_export*) = NULL; -EXPORT_SYMBOL(class_export_dump_hook); #endif static void print_export_data(struct obd_export *exp, const char *status, @@ -1567,7 +1555,6 @@ void dump_exports(struct obd_device *obd, int locks) print_export_data(exp, "ZOMBIE", locks); spin_unlock(&obd_zombie_impexp_lock); } -EXPORT_SYMBOL(dump_exports); void obd_exports_barrier(struct obd_device *obd) { diff --git a/lustre/obdclass/linux/linux-module.c b/lustre/obdclass/linux/linux-module.c index 1fe717f..93dd759 100644 --- a/lustre/obdclass/linux/linux-module.c +++ b/lustre/obdclass/linux/linux-module.c @@ -159,7 +159,6 @@ int obd_ioctl_popdata(void __user *arg, void *data, int len) err = copy_to_user(arg, data, len) ? -EFAULT : 0; RETURN(err); } -EXPORT_SYMBOL(obd_ioctl_popdata); /* opening /dev/obd */ static int obd_class_open(struct inode * inode, struct file * file) diff --git a/lustre/obdclass/llog.c b/lustre/obdclass/llog.c index b499f6c..c34e179 100644 --- a/lustre/obdclass/llog.c +++ b/lustre/obdclass/llog.c @@ -164,7 +164,6 @@ out_err: spin_unlock(&loghandle->lgh_hdr_lock); return rc; } -EXPORT_SYMBOL(llog_cancel_rec); static int llog_read_header(const struct lu_env *env, struct llog_handle *handle, @@ -643,7 +642,6 @@ int llog_declare_create(const struct lu_env *env, cfs_cap_lower(CFS_CAP_SYS_RESOURCE); RETURN(rc); } -EXPORT_SYMBOL(llog_declare_create); int llog_create(const struct lu_env *env, struct llog_handle *handle, struct thandle *th) @@ -667,7 +665,6 @@ int llog_create(const struct lu_env *env, struct llog_handle *handle, cfs_cap_lower(CFS_CAP_SYS_RESOURCE); RETURN(rc); } -EXPORT_SYMBOL(llog_create); int llog_declare_write_rec(const struct lu_env *env, struct llog_handle *handle, @@ -694,7 +691,6 @@ int llog_declare_write_rec(const struct lu_env *env, cfs_cap_lower(CFS_CAP_SYS_RESOURCE); RETURN(rc); } -EXPORT_SYMBOL(llog_declare_write_rec); int llog_write_rec(const struct lu_env *env, struct llog_handle *handle, struct llog_rec_hdr *rec, struct llog_cookie *logcookies, @@ -724,7 +720,6 @@ int llog_write_rec(const struct lu_env *env, struct llog_handle *handle, cfs_cap_lower(CFS_CAP_SYS_RESOURCE); RETURN(rc); } -EXPORT_SYMBOL(llog_write_rec); int llog_add(const struct lu_env *env, struct llog_handle *lgh, struct llog_rec_hdr *rec, struct llog_cookie *logcookies, @@ -983,7 +978,6 @@ int llog_copy_handler(const struct lu_env *env, struct llog_handle *llh, /* Append all records */ return llog_write(env, copy_llh, rec, LLOG_NEXT_IDX); } -EXPORT_SYMBOL(llog_copy_handler); /* backup plain llog */ int llog_backup(const struct lu_env *env, struct obd_device *obd, diff --git a/lustre/obdclass/llog_cat.c b/lustre/obdclass/llog_cat.c index e7114cf..ad4782c 100644 --- a/lustre/obdclass/llog_cat.c +++ b/lustre/obdclass/llog_cat.c @@ -629,7 +629,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) @@ -802,55 +801,6 @@ int llog_cat_cleanup(const struct lu_env *env, struct llog_handle *cathandle, return rc; } -int cat_cancel_cb(const struct lu_env *env, - struct llog_handle *cathandle, - struct llog_rec_hdr *rec, void *data) -{ - struct llog_logid_rec *lir = (struct llog_logid_rec *)rec; - struct llog_handle *loghandle; - struct llog_log_hdr *llh; - int rc; - - ENTRY; - - if (rec->lrh_type != LLOG_LOGID_MAGIC) { - CERROR("invalid record in catalog\n"); - RETURN(-EINVAL); - } - - CDEBUG(D_HA, "processing log "DOSTID":%x at index %u of catalog " - DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen, - rec->lrh_index, POSTID(&cathandle->lgh_id.lgl_oi)); - - rc = llog_cat_id2handle(env, cathandle, &loghandle, &lir->lid_id); - if (rc) { - CERROR("%s: cannot find handle for llog "DOSTID": %d\n", - cathandle->lgh_ctxt->loc_obd->obd_name, - POSTID(&lir->lid_id.lgl_oi), rc); - if (rc == -ENOENT || rc == -ESTALE) { - /* remove index from catalog */ - llog_cat_cleanup(env, cathandle, NULL, rec->lrh_index); - } - RETURN(rc); - } - - llh = loghandle->lgh_hdr; - if ((llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) && - (llh->llh_count == 1)) { - rc = llog_destroy(env, loghandle); - if (rc) - CERROR("%s: fail to destroy empty log: rc = %d\n", - loghandle->lgh_ctxt->loc_obd->obd_name, rc); - - llog_cat_cleanup(env, cathandle, loghandle, - loghandle->u.phd.phd_cookie.lgc_index); - } - llog_handle_put(loghandle); - - RETURN(rc); -} -EXPORT_SYMBOL(cat_cancel_cb); - /* helper to initialize catalog llog and process it to cancel */ int llog_cat_init_and_process(const struct lu_env *env, struct llog_handle *llh) diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c index 326772c8..f1e14ee 100644 --- a/lustre/obdclass/llog_obd.c +++ b/lustre/obdclass/llog_obd.c @@ -251,7 +251,6 @@ LU_KEY_INIT_FINI(llog, struct llog_thread_info); /* context key: llog_thread_key */ LU_CONTEXT_KEY_DEFINE(llog, LCT_MD_THREAD | LCT_MG_THREAD | LCT_LOCAL); LU_KEY_INIT_GENERIC(llog); -EXPORT_SYMBOL(llog_thread_key); int llog_info_init(void) { diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c index f6d4f8e..822e6d5 100644 --- a/lustre/obdclass/llog_swab.c +++ b/lustre/obdclass/llog_swab.c @@ -85,7 +85,6 @@ void lustre_swab_llog_id(struct llog_logid *log_id) __swab64s(&log_id->lgl_oi.oi.oi_seq); __swab32s(&log_id->lgl_ogen); } -EXPORT_SYMBOL(lustre_swab_llog_id); void lustre_swab_llogd_body (struct llogd_body *d) { @@ -118,7 +117,6 @@ void lustre_swab_ll_fid(struct ll_fid *fid) __swab32s (&fid->generation); __swab32s (&fid->f_type); } -EXPORT_SYMBOL(lustre_swab_ll_fid); void lustre_swab_lu_seq_range(struct lu_seq_range *range) { @@ -284,7 +282,6 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec) __swab32s(&tail->lrt_index); } } -EXPORT_SYMBOL(lustre_swab_llog_rec); static void print_llog_hdr(struct llog_log_hdr *h) { @@ -363,7 +360,6 @@ void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg) EXIT; return; } -EXPORT_SYMBOL(lustre_swab_lustre_cfg); /* used only for compatibility with old on-disk cfg_marker data */ struct cfg_marker32 { @@ -427,4 +423,3 @@ void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size) EXIT; return; } -EXPORT_SYMBOL(lustre_swab_cfg_marker); diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c index 14ae2a2..eaa63cc 100644 --- a/lustre/obdclass/llog_test.c +++ b/lustre/obdclass/llog_test.c @@ -518,7 +518,7 @@ static int llog_test_5(const struct lu_env *env, struct obd_device *obd) cancel_count = 0; rc = llog_cat_process(env, llh, llog_cancel_rec_cb, "foobar", 0, 0); if (rc != -LLOG_EEMPTY) { - CERROR("5c: process with cat_cancel_cb failed: %d\n", rc); + CERROR("5c: process with llog_cancel_rec_cb failed: %d\n", rc); GOTO(out, rc); } @@ -970,7 +970,7 @@ static int llog_test_8(const struct lu_env *env, struct obd_device *obd) plain_counter = 0; rc = llog_cat_process(env, llh, test_8_cb, "foobar", 0, 0); if (rc != 0) { - CERROR("5a: process with cat_cancel_cb failed: %d\n", rc); + CERROR("5a: process with test_8_cb failed: %d\n", rc); GOTO(out, rc); } orig_counter = plain_counter; @@ -1047,7 +1047,7 @@ static int llog_test_8(const struct lu_env *env, struct obd_device *obd) plain_counter = 0; rc = llog_cat_process(env, llh, test_8_cb, "foobar", 0, 0); if (rc != 0) { - CERROR("8d: process with cat_cancel_cb failed: %d\n", rc); + CERROR("8d: process with test_8_cb failed: %d\n", rc); GOTO(out, rc); } diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index 363538b..fe49186 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -238,7 +238,6 @@ int remove_proc_subtree(const char *name, struct proc_dir_entry *parent) up_write(&_lprocfs_lock); return 0; } -EXPORT_SYMBOL(remove_proc_subtree); #endif /* !HAVE_REMOVE_PROC_SUBTREE */ #ifndef HAVE_PROC_REMOVE @@ -559,7 +558,6 @@ void lprocfs_stats_collect(struct lprocfs_stats *stats, int idx, lprocfs_stats_unlock(stats, LPROCFS_GET_NUM_CPU, &flags); } -EXPORT_SYMBOL(lprocfs_stats_collect); /** * Append a space separated list of current set flags to str. @@ -1055,7 +1053,6 @@ int lprocfs_stats_alloc_one(struct lprocfs_stats *stats, unsigned int cpuid) } return rc; } -EXPORT_SYMBOL(lprocfs_stats_alloc_one); struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, enum lprocfs_stats_flags flags) @@ -1375,7 +1372,6 @@ void lprocfs_init_mps_stats(int num_private_stats, struct lprocfs_stats *stats) LPROCFS_MD_OP_INIT(num_private_stats, stats, intent_getattr_async); LPROCFS_MD_OP_INIT(num_private_stats, stats, revalidate_lock); } -EXPORT_SYMBOL(lprocfs_init_mps_stats); int lprocfs_alloc_md_stats(struct obd_device *obd, unsigned int num_private_stats) @@ -1607,7 +1603,6 @@ int lprocfs_read_frac_helper(char *buffer, unsigned long count, long val, buffer[prtn++] ='\n'; return prtn; } -EXPORT_SYMBOL(lprocfs_read_frac_helper); int lprocfs_seq_read_frac_helper(struct seq_file *m, long val, int mult) { @@ -1838,7 +1833,6 @@ int lprocfs_obd_rd_max_pages_per_rpc(char *page, char **start, off_t off, return rc; } -EXPORT_SYMBOL(lprocfs_obd_rd_max_pages_per_rpc); int lprocfs_obd_max_pages_per_rpc_seq_show(struct seq_file *m, void *data) { diff --git a/lustre/obdclass/lprocfs_status_server.c b/lustre/obdclass/lprocfs_status_server.c index 4939e1b..76b1b99 100644 --- a/lustre/obdclass/lprocfs_status_server.c +++ b/lustre/obdclass/lprocfs_status_server.c @@ -417,7 +417,6 @@ int lprocfs_exp_cleanup(struct obd_export *exp) return 0; } -EXPORT_SYMBOL(lprocfs_exp_cleanup); #define LPROCFS_OBD_OP_INIT(base, stats, op) \ do { \ diff --git a/lustre/obdclass/lu_object.c b/lustre/obdclass/lu_object.c index 3e17c05..a8ff775 100644 --- a/lustre/obdclass/lu_object.c +++ b/lustre/obdclass/lu_object.c @@ -566,7 +566,6 @@ int lu_object_invariant(const struct lu_object *o) } return 1; } -EXPORT_SYMBOL(lu_object_invariant); static struct lu_object *htable_lookup(struct lu_site *s, cfs_hash_bd_t *bd, @@ -1360,7 +1359,6 @@ void lu_stack_fini(const struct lu_env *env, struct lu_device *top) } } } -EXPORT_SYMBOL(lu_stack_fini); enum { /** @@ -1586,14 +1584,12 @@ void lu_context_key_quiesce(struct lu_context_key *key) ++key_set_version; } } -EXPORT_SYMBOL(lu_context_key_quiesce); void lu_context_key_revive(struct lu_context_key *key) { key->lct_tags &= ~LCT_QUIESCENT; ++key_set_version; } -EXPORT_SYMBOL(lu_context_key_revive); static void keys_fini(struct lu_context *ctx) { @@ -1753,7 +1749,6 @@ int lu_context_refill(struct lu_context *ctx) { return likely(ctx->lc_version == key_set_version) ? 0 : keys_fill(ctx); } -EXPORT_SYMBOL(lu_context_refill); /** * lu_ctx_tags/lu_ses_tags will be updated if there are new types of @@ -2050,7 +2045,6 @@ void lu_context_keys_dump(void) } } } -EXPORT_SYMBOL(lu_context_keys_dump); /** * Initialization of global lu_* data. @@ -2180,7 +2174,6 @@ int lu_site_stats_print(const struct lu_site *s, char *page, int count) ls_stats_read(s->ls_stats, LU_SS_CACHE_DEATH_RACE), ls_stats_read(s->ls_stats, LU_SS_LRU_PURGED)); } -EXPORT_SYMBOL(lu_site_stats_print); /** * Helper function to initialize a number of kmem slab caches at once. @@ -2345,4 +2338,3 @@ int lu_buf_check_and_grow(struct lu_buf *buf, size_t len) buf->lb_len = len; return 0; } -EXPORT_SYMBOL(lu_buf_check_and_grow); diff --git a/lustre/obdclass/lu_ref.c b/lustre/obdclass/lu_ref.c index a1bfc25..3308b17 100644 --- a/lustre/obdclass/lu_ref.c +++ b/lustre/obdclass/lu_ref.c @@ -102,7 +102,6 @@ void lu_ref_print(const struct lu_ref *ref) CERROR(" link: %s %p\n", link->ll_scope, link->ll_source); } } -EXPORT_SYMBOL(lu_ref_print); static int lu_ref_is_marker(const struct lu_ref *ref) { @@ -124,7 +123,6 @@ void lu_ref_print_all(void) } spin_unlock(&lu_ref_refs_guard); } -EXPORT_SYMBOL(lu_ref_print_all); void lu_ref_init_loc(struct lu_ref *ref, const char *func, const int line) { @@ -137,7 +135,6 @@ void lu_ref_init_loc(struct lu_ref *ref, const char *func, const int line) list_add(&ref->lf_linkage, &lu_ref_refs); spin_unlock(&lu_ref_refs_guard); } -EXPORT_SYMBOL(lu_ref_init_loc); void lu_ref_fini(struct lu_ref *ref) { @@ -147,7 +144,6 @@ void lu_ref_fini(struct lu_ref *ref) list_del_init(&ref->lf_linkage); spin_unlock(&lu_ref_refs_guard); } -EXPORT_SYMBOL(lu_ref_fini); static struct lu_ref_link *lu_ref_add_context(struct lu_ref *ref, int flags, @@ -185,7 +181,6 @@ void lu_ref_add(struct lu_ref *ref, const char *scope, const void *source) might_sleep(); lu_ref_add_context(ref, GFP_IOFS, scope, source); } -EXPORT_SYMBOL(lu_ref_add); void lu_ref_add_at(struct lu_ref *ref, struct lu_ref_link *link, const char *scope, const void *source) @@ -198,7 +193,6 @@ void lu_ref_add_at(struct lu_ref *ref, struct lu_ref_link *link, ref->lf_refs++; spin_unlock(&ref->lf_guard); } -EXPORT_SYMBOL(lu_ref_add_at); /** * Version of lu_ref_add() to be used in non-blockable contexts. @@ -208,7 +202,6 @@ void lu_ref_add_atomic(struct lu_ref *ref, const char *scope, { lu_ref_add_context(ref, GFP_ATOMIC, scope, source); } -EXPORT_SYMBOL(lu_ref_add_atomic); static inline int lu_ref_link_eq(const struct lu_ref_link *link, const char *scope, const void *source) @@ -262,7 +255,6 @@ void lu_ref_del(struct lu_ref *ref, const char *scope, const void *source) spin_unlock(&ref->lf_guard); } } -EXPORT_SYMBOL(lu_ref_del); void lu_ref_set_at(struct lu_ref *ref, struct lu_ref_link *link, const char *scope, @@ -276,7 +268,6 @@ void lu_ref_set_at(struct lu_ref *ref, struct lu_ref_link *link, link->ll_source = source1; spin_unlock(&ref->lf_guard); } -EXPORT_SYMBOL(lu_ref_set_at); void lu_ref_del_at(struct lu_ref *ref, struct lu_ref_link *link, const char *scope, const void *source) @@ -289,7 +280,6 @@ void lu_ref_del_at(struct lu_ref *ref, struct lu_ref_link *link, ref->lf_refs--; spin_unlock(&ref->lf_guard); } -EXPORT_SYMBOL(lu_ref_del_at); #ifdef CONFIG_PROC_FS diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c index bce4efe..c510250 100644 --- a/lustre/obdclass/lustre_peer.c +++ b/lustre/obdclass/lustre_peer.c @@ -142,7 +142,6 @@ int class_add_uuid(const char *uuid, __u64 nid) } return 0; } -EXPORT_SYMBOL(class_add_uuid); /* Delete the nids for one uuid if specified, otherwise delete all */ int class_del_uuid(const char *uuid) diff --git a/lustre/obdclass/md_attrs.c b/lustre/obdclass/md_attrs.c index f996438..c82e7f9 100644 --- a/lustre/obdclass/md_attrs.c +++ b/lustre/obdclass/md_attrs.c @@ -144,7 +144,6 @@ void lustre_hsm_swab(struct hsm_attrs *attrs) __swab64s(&attrs->hsm_arch_ver); } }; -EXPORT_SYMBOL(lustre_hsm_swab); /* * Swab and extract HSM attributes from on-disk xattr. diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c index 92d95eb..587dbe2 100644 --- a/lustre/obdclass/obd_config.c +++ b/lustre/obdclass/obd_config.c @@ -284,7 +284,6 @@ int class_parse_net(char *buf, __u32 *net, char **endh) { return class_parse_value(buf, CLASS_PARSE_NET, (void *)net, endh, 0); } -EXPORT_SYMBOL(class_parse_net); /* 1 param contains key and match * 0 param contains key and not match @@ -306,7 +305,6 @@ int class_match_nid(char *buf, char *key, lnet_nid_t nid) } return rc; } -EXPORT_SYMBOL(class_match_nid); int class_match_net(char *buf, char *key, __u32 net) { @@ -324,7 +322,6 @@ int class_match_net(char *buf, char *key, __u32 net) } return rc; } -EXPORT_SYMBOL(class_match_net); /********************** class fns **********************/ @@ -690,7 +687,6 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg) RETURN(0); } -EXPORT_SYMBOL(class_cleanup); struct obd_device *class_incref(struct obd_device *obd, const char *scope, const void *source) @@ -782,7 +778,6 @@ int class_add_conn(struct obd_device *obd, struct lustre_cfg *lcfg) RETURN(rc); } -EXPORT_SYMBOL(class_add_conn); /** Remove a failover nid location. */ diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index 24cd79c..7d2e7f1 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -183,7 +183,6 @@ int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd, lustre_cfg_free(lcfg); return(rc); } -EXPORT_SYMBOL(do_lcfg); /** Call class_attach and class_setup. These methods in turn call * obd type-specific methods. diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c index a669f56..96681a0 100644 --- a/lustre/obdclass/obd_mount_server.c +++ b/lustre/obdclass/obd_mount_server.c @@ -1047,7 +1047,6 @@ int server_mti_print(const char *title, struct mgs_target_info *mti) mti->mti_config_ver, mti->mti_flags); return 0; } -EXPORT_SYMBOL(server_mti_print); /* Generate data for registration */ static int server_lsi2mti(struct lustre_sb_info *lsi, @@ -1868,4 +1867,3 @@ void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd) obd->obd_recovery_time_hard = hard; obd->obd_recovery_ir_factor = factor; } -EXPORT_SYMBOL(server_calc_timeout);