From 34bdd30ec6a2010dfd98c5110487df210d03815d Mon Sep 17 00:00:00 2001 From: Frank Zago Date: Fri, 9 Jan 2015 12:28:13 -0600 Subject: [PATCH] LU-5829 misc: 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. Signed-off-by: frank zago Change-Id: Ibb6dd722c47c7c76275ac24f1a6d8a4a988f433a Reviewed-on: http://review.whamcloud.com/13321 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- lustre/fid/fid_handler.c | 1 - lustre/fid/fid_lib.c | 2 -- lustre/fld/fld_handler.c | 1 - lustre/fld/fld_request.c | 2 -- lustre/lfsck/lfsck_lib.c | 1 - lustre/llite/llite_capa.c | 1 - lustre/lmv/lmv_obd.c | 2 -- lustre/lov/lov_dev.c | 1 - lustre/osd-ldiskfs/osd_iam.c | 24 ------------------------ lustre/osd-ldiskfs/osd_iam_lfix.c | 2 -- lustre/osd-ldiskfs/osd_iam_lvar.c | 1 - lustre/target/tgt_handler.c | 9 --------- lustre/target/tgt_lastrcvd.c | 8 -------- lustre/target/tgt_main.c | 1 - 14 files changed, 56 deletions(-) diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c index 62f2eab..fe94281 100644 --- a/lustre/fid/fid_handler.c +++ b/lustre/fid/fid_handler.c @@ -324,7 +324,6 @@ int seq_server_alloc_meta(struct lu_server_seq *seq, RETURN(rc); } -EXPORT_SYMBOL(seq_server_alloc_meta); static int seq_server_handle(struct lu_site *site, const struct lu_env *env, diff --git a/lustre/fid/fid_lib.c b/lustre/fid/fid_lib.c index 46835f1..5db738c 100644 --- a/lustre/fid/fid_lib.c +++ b/lustre/fid/fid_lib.c @@ -67,14 +67,12 @@ const struct lu_seq_range LUSTRE_SEQ_SPACE_RANGE = { FID_SEQ_NORMAL, (__u64)~0ULL }; -EXPORT_SYMBOL(LUSTRE_SEQ_SPACE_RANGE); /* Zero range, used for init and other purposes. */ const struct lu_seq_range LUSTRE_SEQ_ZERO_RANGE = { 0, 0 }; -EXPORT_SYMBOL(LUSTRE_SEQ_ZERO_RANGE); /* Lustre Big Fs Lock fid. */ const struct lu_fid LUSTRE_BFL_FID = { .f_seq = FID_SEQ_SPECIAL, diff --git a/lustre/fld/fld_handler.c b/lustre/fld/fld_handler.c index 062bef9..2f355a4 100644 --- a/lustre/fld/fld_handler.c +++ b/lustre/fld/fld_handler.c @@ -392,7 +392,6 @@ int fid_is_local(const struct lu_env *env, } return result; } -EXPORT_SYMBOL(fid_is_local); static void fld_server_proc_fini(struct lu_server_fld *fld); diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c index 3ef67a7..c8df248 100644 --- a/lustre/fld/fld_request.c +++ b/lustre/fld/fld_request.c @@ -227,7 +227,6 @@ int fld_client_del_target(struct lu_client_fld *fld, __u64 idx) spin_unlock(&fld->lcf_lock); RETURN(-ENOENT); } -EXPORT_SYMBOL(fld_client_del_target); #ifdef CONFIG_PROC_FS static int fld_client_proc_init(struct lu_client_fld *fld) @@ -516,7 +515,6 @@ void fld_client_flush(struct lu_client_fld *fld) { fld_cache_flush(fld->lcf_cache); } -EXPORT_SYMBOL(fld_client_flush); struct proc_dir_entry *fld_type_proc_dir; diff --git a/lustre/lfsck/lfsck_lib.c b/lustre/lfsck/lfsck_lib.c index 8b05183..2882700 100644 --- a/lustre/lfsck/lfsck_lib.c +++ b/lustre/lfsck/lfsck_lib.c @@ -3060,7 +3060,6 @@ int lfsck_query(const struct lu_env *env, struct dt_device *key, RETURN(rc); } -EXPORT_SYMBOL(lfsck_query); int lfsck_register_namespace(const struct lu_env *env, struct dt_device *key, struct ldlm_namespace *ns) diff --git a/lustre/llite/llite_capa.c b/lustre/llite/llite_capa.c index c62b99e..16a7efa 100644 --- a/lustre/llite/llite_capa.c +++ b/lustre/llite/llite_capa.c @@ -372,7 +372,6 @@ struct obd_capa *ll_osscapa_get(struct inode *inode, __u64 opc) RETURN(ocapa); } -EXPORT_SYMBOL(ll_osscapa_get); struct obd_capa *ll_mdscapa_get(struct inode *inode) { diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c index 03cacfa..f0dccda 100644 --- a/lustre/lmv/lmv_obd.c +++ b/lustre/lmv/lmv_obd.c @@ -2926,7 +2926,6 @@ int lmv_pack_md(union lmv_mds_md **lmmp, const struct lmv_stripe_md *lsm, RETURN(lmm_size); } -EXPORT_SYMBOL(lmv_pack_md); static int lmv_unpack_md_v1(struct obd_export *exp, struct lmv_stripe_md *lsm, const struct lmv_mds_md_v1 *lmm1) @@ -3065,7 +3064,6 @@ int lmv_alloc_memmd(struct lmv_stripe_md **lsmp, int stripes) { return lmv_unpack_md(NULL, lsmp, NULL, stripes); } -EXPORT_SYMBOL(lmv_alloc_memmd); void lmv_free_memmd(struct lmv_stripe_md *lsm) { diff --git a/lustre/lov/lov_dev.c b/lustre/lov/lov_dev.c index 0c8c8d3..c682cac 100644 --- a/lustre/lov/lov_dev.c +++ b/lustre/lov/lov_dev.c @@ -525,6 +525,5 @@ struct lu_device_type lov_device_type = { .ldt_ops = &lov_device_type_ops, .ldt_ctx_tags = LCT_CL_THREAD }; -EXPORT_SYMBOL(lov_device_type); /** @} lov */ diff --git a/lustre/osd-ldiskfs/osd_iam.c b/lustre/osd-ldiskfs/osd_iam.c index 7c0e1f1..8a1fdf6 100644 --- a/lustre/osd-ldiskfs/osd_iam.c +++ b/lustre/osd-ldiskfs/osd_iam.c @@ -163,7 +163,6 @@ void iam_format_register(struct iam_format *fmt) { list_add(&fmt->if_linkage, &iam_formats); } -EXPORT_SYMBOL(iam_format_register); static struct buffer_head * iam_load_idle_blocks(struct iam_container *c, iam_ptr_t blk) @@ -263,7 +262,6 @@ int iam_container_init(struct iam_container *c, mutex_init(&c->ic_idle_mutex); return 0; } -EXPORT_SYMBOL(iam_container_init); /* * Determine container format. @@ -272,7 +270,6 @@ int iam_container_setup(struct iam_container *c) { return iam_format_guess(c); } -EXPORT_SYMBOL(iam_container_setup); /* * Finalize container @c, release all resources. @@ -284,7 +281,6 @@ void iam_container_fini(struct iam_container *c) brelse(c->ic_root_bh); c->ic_root_bh = NULL; } -EXPORT_SYMBOL(iam_container_fini); void iam_path_init(struct iam_path *path, struct iam_container *c, struct iam_path_descr *pd) @@ -350,12 +346,10 @@ struct iam_path_descr *iam_ipd_alloc(void *area, int keysize) ipd->ipd_key_scratch[i] = karea; return ipd; } -EXPORT_SYMBOL(iam_ipd_alloc); void iam_ipd_free(struct iam_path_descr *ipd) { } -EXPORT_SYMBOL(iam_ipd_free); int iam_node_read(struct iam_container *c, iam_ptr_t ptr, handle_t *h, struct buffer_head **bh) @@ -725,7 +719,6 @@ int iam_it_init(struct iam_iterator *it, struct iam_container *c, __u32 flags, iam_path_init(&it->ii_path, c, pd); return 0; } -EXPORT_SYMBOL(iam_it_init); /* * Finalize iterator and release all resources. @@ -737,7 +730,6 @@ void iam_it_fini(struct iam_iterator *it) assert_corr(it_state(it) == IAM_IT_DETACHED); iam_path_fini(&it->ii_path); } -EXPORT_SYMBOL(iam_it_fini); /* * this locking primitives are used to protect parts @@ -1196,7 +1188,6 @@ int iam_it_get(struct iam_iterator *it, const struct iam_key *k) it_keycmp(it, k) <= 0)); return result; } -EXPORT_SYMBOL(iam_it_get); /* * Attach iterator by index key. @@ -1235,7 +1226,6 @@ int iam_it_get_at(struct iam_iterator *it, const struct iam_key *k) assert_corr(ergo(result >= 0, it_state(it) == IAM_IT_ATTACHED)); return result; } -EXPORT_SYMBOL(iam_it_get_at); /* * Duplicates iterator. @@ -1276,7 +1266,6 @@ void iam_it_put(struct iam_iterator *it) iam_leaf_fini(&it->ii_path.ip_leaf); } } -EXPORT_SYMBOL(iam_it_put); static struct iam_ikey *iam_it_ikey_get(const struct iam_iterator *it, struct iam_ikey *ikey); @@ -1554,7 +1543,6 @@ int iam_it_next(struct iam_iterator *it) it_ikeycmp(it, ik_orig) >= 0)); return result; } -EXPORT_SYMBOL(iam_it_next); /* * Return pointer to the record under iterator. @@ -1568,7 +1556,6 @@ struct iam_rec *iam_it_rec_get(const struct iam_iterator *it) assert_corr(it_at_rec(it)); return iam_leaf_rec(&it->ii_path.ip_leaf); } -EXPORT_SYMBOL(iam_it_rec_get); static void iam_it_reccpy(struct iam_iterator *it, const struct iam_rec *r) { @@ -1606,7 +1593,6 @@ int iam_it_rec_set(handle_t *h, } return result; } -EXPORT_SYMBOL(iam_it_rec_set); /* * Return pointer to the index key under iterator. @@ -1636,7 +1622,6 @@ struct iam_key *iam_it_key_get(const struct iam_iterator *it) assert_corr(it_at_rec(it)); return iam_leaf_key(&it->ii_path.ip_leaf); } -EXPORT_SYMBOL(iam_it_key_get); /* * Return size of key under iterator (in bytes) @@ -1651,7 +1636,6 @@ int iam_it_key_size(const struct iam_iterator *it) assert_corr(it_at_rec(it)); return iam_leaf_key_size(&it->ii_path.ip_leaf); } -EXPORT_SYMBOL(iam_it_key_size); static struct buffer_head * iam_new_node(handle_t *h, struct iam_container *c, iam_ptr_t *b, int *e) @@ -2243,7 +2227,6 @@ int iam_it_rec_insert(handle_t *h, struct iam_iterator *it, it_keycmp(it, k) == 0)); return result; } -EXPORT_SYMBOL(iam_it_rec_insert); static inline int iam_idle_blocks_limit(struct inode *inode) { @@ -2478,7 +2461,6 @@ int iam_it_rec_delete(handle_t *h, struct iam_iterator *it) it_state(it) == IAM_IT_DETACHED); return result; } -EXPORT_SYMBOL(iam_it_rec_delete); /* * Convert iterator to cookie. @@ -2499,7 +2481,6 @@ iam_pos_t iam_it_store(const struct iam_iterator *it) result = 0; return *(iam_pos_t *)iam_it_ikey_get(it, (void *)&result); } -EXPORT_SYMBOL(iam_it_store); /* * Restore iterator from cookie. @@ -2516,7 +2497,6 @@ int iam_it_load(struct iam_iterator *it, iam_pos_t pos) assert_corr(iam_it_container(it)->ic_descr->id_ikey_size <= sizeof pos); return iam_it_iget(it, (struct iam_ikey *)&pos); } -EXPORT_SYMBOL(iam_it_load); /***********************************************************************/ /* invariants */ @@ -2602,7 +2582,6 @@ int iam_lookup(struct iam_container *c, const struct iam_key *k, iam_it_fini(&it); return result; } -EXPORT_SYMBOL(iam_lookup); /* * Insert new record @r with key @k into container @c (within context of @@ -2631,7 +2610,6 @@ int iam_insert(handle_t *h, struct iam_container *c, const struct iam_key *k, iam_it_fini(&it); return result; } -EXPORT_SYMBOL(iam_insert); /* * Update record with the key @k in container @c (within context of @@ -2662,7 +2640,6 @@ int iam_update(handle_t *h, struct iam_container *c, const struct iam_key *k, iam_it_fini(&it); return result; } -EXPORT_SYMBOL(iam_update); /* * Delete existing record with key @k. @@ -2687,7 +2664,6 @@ int iam_delete(handle_t *h, struct iam_container *c, const struct iam_key *k, iam_it_fini(&it); return result; } -EXPORT_SYMBOL(iam_delete); int iam_root_limit(int rootgap, int blocksize, int size) { diff --git a/lustre/osd-ldiskfs/osd_iam_lfix.c b/lustre/osd-ldiskfs/osd_iam_lfix.c index 897d9da..db100f2 100644 --- a/lustre/osd-ldiskfs/osd_iam_lfix.c +++ b/lustre/osd-ldiskfs/osd_iam_lfix.c @@ -223,7 +223,6 @@ static void iam_lfix_next(struct iam_leaf *l) * Bug chasing. */ int lfix_dump = 0; -EXPORT_SYMBOL(lfix_dump); static char hdigit(char ch) { @@ -880,4 +879,3 @@ int iam_lfix_create(struct inode *obj, brelse(root_node); return result; } -EXPORT_SYMBOL(iam_lfix_create); diff --git a/lustre/osd-ldiskfs/osd_iam_lvar.c b/lustre/osd-ldiskfs/osd_iam_lvar.c index 9ca1930..0092a8e 100644 --- a/lustre/osd-ldiskfs/osd_iam_lvar.c +++ b/lustre/osd-ldiskfs/osd_iam_lvar.c @@ -1034,7 +1034,6 @@ int iam_lvar_create(struct inode *obj, brelse(root_node); return result; } -EXPORT_SYMBOL(iam_lvar_create); static struct iam_operations lvar_ops = { .id_root_ptr = lvar_root_ptr, diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c index 0618087..dd93805 100644 --- a/lustre/target/tgt_handler.c +++ b/lustre/target/tgt_handler.c @@ -998,13 +998,11 @@ int tgt_obd_log_cancel(struct tgt_session_info *tsi) { return err_serious(-EOPNOTSUPP); } -EXPORT_SYMBOL(tgt_obd_log_cancel); int tgt_obd_qc_callback(struct tgt_session_info *tsi) { return err_serious(-EOPNOTSUPP); } -EXPORT_SYMBOL(tgt_obd_qc_callback); int tgt_sendpage(struct tgt_session_info *tsi, struct lu_rdpg *rdpg, int nob) { @@ -1127,7 +1125,6 @@ out: } return rc; } -EXPORT_SYMBOL(tgt_obd_idx_read); struct tgt_handler tgt_obd_handlers[] = { TGT_OBD_HDL (0, OBD_PING, tgt_obd_ping), @@ -1257,19 +1254,16 @@ int tgt_convert(struct tgt_session_info *tsi) RETURN(req->rq_status); } -EXPORT_SYMBOL(tgt_convert); int tgt_bl_callback(struct tgt_session_info *tsi) { return err_serious(-EOPNOTSUPP); } -EXPORT_SYMBOL(tgt_bl_callback); int tgt_cp_callback(struct tgt_session_info *tsi) { return err_serious(-EOPNOTSUPP); } -EXPORT_SYMBOL(tgt_cp_callback); /* generic LDLM target handler */ struct tgt_handler tgt_dlm_handlers[] = { @@ -1318,7 +1312,6 @@ int tgt_llog_destroy(struct tgt_session_info *tsi) RETURN(rc); } -EXPORT_SYMBOL(tgt_llog_destroy); int tgt_llog_read_header(struct tgt_session_info *tsi) { @@ -1566,7 +1559,6 @@ int tgt_brw_lock(struct ldlm_namespace *ns, struct ldlm_res_id *res_id, nb[nrbufs - 1].rnb_len - 1, lh, mode, &flags)); } -EXPORT_SYMBOL(tgt_brw_lock); void tgt_brw_unlock(struct obd_ioobj *obj, struct niobuf_remote *niob, struct lustre_handle *lh, int mode) @@ -1582,7 +1574,6 @@ void tgt_brw_unlock(struct obd_ioobj *obj, struct niobuf_remote *niob, tgt_extent_unlock(lh, mode); EXIT; } -EXPORT_SYMBOL(tgt_brw_unlock); static __u32 tgt_checksum_bulk(struct lu_target *tgt, struct ptlrpc_bulk_desc *desc, int opc, diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c index c7b1d21..50147d3 100644 --- a/lustre/target/tgt_lastrcvd.c +++ b/lustre/target/tgt_lastrcvd.c @@ -127,7 +127,6 @@ int tgt_client_data_read(const struct lu_env *env, struct lu_target *tgt, lcd->lcd_last_close_result, rc); return rc; } -EXPORT_SYMBOL(tgt_client_data_read); int tgt_client_data_write(const struct lu_env *env, struct lu_target *tgt, struct lsd_client_data *lcd, loff_t *off, @@ -143,7 +142,6 @@ int tgt_client_data_write(const struct lu_env *env, struct lu_target *tgt, return dt_record_write(env, tgt->lut_last_rcvd, &tti->tti_buf, off, th); } -EXPORT_SYMBOL(tgt_client_data_write); /** * Update client data in last_rcvd @@ -218,7 +216,6 @@ int tgt_server_data_read(const struct lu_env *env, struct lu_target *tgt) tgt->lut_lsd.lsd_uuid, tgt->lut_lsd.lsd_last_transno, rc); return rc; } -EXPORT_SYMBOL(tgt_server_data_read); int tgt_server_data_write(const struct lu_env *env, struct lu_target *tgt, struct thandle *th) @@ -241,7 +238,6 @@ int tgt_server_data_write(const struct lu_env *env, struct lu_target *tgt, RETURN(rc); } -EXPORT_SYMBOL(tgt_server_data_write); /** * Update server data in last_rcvd @@ -327,7 +323,6 @@ cleanup: RETURN(rc); } -EXPORT_SYMBOL(tgt_truncate_last_rcvd); static void tgt_client_epoch_update(const struct lu_env *env, struct obd_export *exp) @@ -396,7 +391,6 @@ void tgt_boot_epoch_update(struct lu_target *tgt) tgt_server_data_update(&env, tgt, 1); lu_env_fini(&env); } -EXPORT_SYMBOL(tgt_boot_epoch_update); /** * commit callback, need to update last_commited value @@ -469,7 +463,6 @@ int tgt_last_commit_cb_add(struct thandle *th, struct lu_target *tgt, return rc; } -EXPORT_SYMBOL(tgt_last_commit_cb_add); struct tgt_new_client_callback { struct dt_txn_commit_cb lncc_cb; @@ -633,7 +626,6 @@ int tgt_client_add(const struct lu_env *env, struct obd_export *exp, int idx) RETURN(0); } -EXPORT_SYMBOL(tgt_client_add); int tgt_client_del(const struct lu_env *env, struct obd_export *exp) { diff --git a/lustre/target/tgt_main.c b/lustre/target/tgt_main.c index 1029f26..cdc60b8 100644 --- a/lustre/target/tgt_main.c +++ b/lustre/target/tgt_main.c @@ -180,7 +180,6 @@ struct lu_context_key tgt_thread_key = { .lct_fini = tgt_key_fini, .lct_exit = tgt_key_exit, }; -EXPORT_SYMBOL(tgt_thread_key); LU_KEY_INIT_GENERIC(tgt); -- 1.8.3.1