From 3ee0e0908f12de97346cd5fe2996ad147adb9481 Mon Sep 17 00:00:00 2001 From: Frank Zago Date: Fri, 9 Jan 2015 12:21:12 -0600 Subject: [PATCH] LU-5829 ptlrpc: 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. Change-Id: I5dad1093f136577fa268cd7ecbebd1d660cfa8ef Signed-off-by: frank zago Reviewed-on: http://review.whamcloud.com/12510 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Dmitry Eremin Reviewed-by: John L. Hammond Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre/include/lustre_net.h | 7 ---- lustre/ptlrpc/client.c | 23 ++--------- lustre/ptlrpc/connection.c | 5 --- lustre/ptlrpc/gss/gss_svc_upcall.c | 1 - lustre/ptlrpc/import.c | 3 -- lustre/ptlrpc/llog_server.c | 6 --- lustre/ptlrpc/niobuf.c | 8 ---- lustre/ptlrpc/nrs.c | 2 - lustre/ptlrpc/pack_generic.c | 81 -------------------------------------- lustre/ptlrpc/pinger.c | 1 - lustre/ptlrpc/ptlrpc_internal.h | 5 +++ lustre/ptlrpc/ptlrpcd.c | 1 - lustre/ptlrpc/recover.c | 2 - lustre/ptlrpc/sec_bulk.c | 4 -- lustre/ptlrpc/sec_config.c | 6 --- lustre/ptlrpc/sec_gc.c | 2 - lustre/ptlrpc/service.c | 4 -- 17 files changed, 8 insertions(+), 153 deletions(-) diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h index 085a811..274aa90 100644 --- a/lustre/include/lustre_net.h +++ b/lustre/include/lustre_net.h @@ -2947,7 +2947,6 @@ int ptlrpc_send_reply(struct ptlrpc_request *req, int flags); int ptlrpc_reply(struct ptlrpc_request *req); int ptlrpc_send_error(struct ptlrpc_request *req, int difficult); int ptlrpc_error(struct ptlrpc_request *req); -void ptlrpc_resend_req(struct ptlrpc_request *request); int ptlrpc_at_get_net_latency(struct ptlrpc_request *req); int ptl_send_rpc(struct ptlrpc_request *request, int noreply); int ptlrpc_register_rqbd(struct ptlrpc_request_buffer_desc *rqbd); @@ -2968,7 +2967,6 @@ struct ptlrpc_connection *ptlrpc_uuid_to_connection(struct obd_uuid *uuid); int ptlrpc_queue_wait(struct ptlrpc_request *req); int ptlrpc_replay_req(struct ptlrpc_request *req); -int ptlrpc_unregister_reply(struct ptlrpc_request *req, int async); void ptlrpc_restart_req(struct ptlrpc_request *req); void ptlrpc_abort_inflight(struct obd_import *imp); void ptlrpc_cleanup_imp(struct obd_import *imp); @@ -2979,16 +2977,11 @@ struct ptlrpc_request_set *ptlrpc_prep_fcset(int max, set_producer_func func, void *arg); int ptlrpc_set_add_cb(struct ptlrpc_request_set *set, set_interpreter_func fn, void *data); -int ptlrpc_set_next_timeout(struct ptlrpc_request_set *); int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set); int ptlrpc_set_wait(struct ptlrpc_request_set *); -int ptlrpc_expired_set(void *data); -void ptlrpc_interrupted_set(void *data); void ptlrpc_mark_interrupted(struct ptlrpc_request *req); void ptlrpc_set_destroy(struct ptlrpc_request_set *); void ptlrpc_set_add_req(struct ptlrpc_request_set *, struct ptlrpc_request *); -void ptlrpc_set_add_new_req(struct ptlrpcd_ctl *pc, - struct ptlrpc_request *req); void ptlrpc_free_rq_pool(struct ptlrpc_request_pool *pool); void ptlrpc_add_rqs_to_pool(struct ptlrpc_request_pool *pool, int num_rq); diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c index 7cfb6aa..3ef3292 100644 --- a/lustre/ptlrpc/client.c +++ b/lustre/ptlrpc/client.c @@ -49,6 +49,7 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req); static int ptlrpcd_check_work(struct ptlrpc_request *req); +static int ptlrpc_unregister_reply(struct ptlrpc_request *request, int async); /** * Initialize passed in client structure \a cl. @@ -91,7 +92,6 @@ struct ptlrpc_connection *ptlrpc_uuid_to_connection(struct obd_uuid *uuid) return c; } -EXPORT_SYMBOL(ptlrpc_uuid_to_connection); /** * Allocate and initialize new bulk descriptor on the sender. @@ -834,7 +834,6 @@ ptlrpc_prep_req_pool(struct obd_import *imp, } return request; } -EXPORT_SYMBOL(ptlrpc_prep_req_pool); /** * Same as ptlrpc_prep_req_pool, but without pool @@ -846,7 +845,6 @@ ptlrpc_prep_req(struct obd_import *imp, __u32 version, int opcode, int count, return ptlrpc_prep_req_pool(imp, version, opcode, count, lengths, bufs, NULL); } -EXPORT_SYMBOL(ptlrpc_prep_req); /** * Allocate and initialize new request set structure. @@ -901,7 +899,6 @@ struct ptlrpc_request_set *ptlrpc_prep_fcset(int max, set_producer_func func, RETURN(set); } -EXPORT_SYMBOL(ptlrpc_prep_fcset); /** * Wind down and free request set structure previously allocated with @@ -983,7 +980,6 @@ int ptlrpc_set_add_cb(struct ptlrpc_request_set *set, RETURN(0); } -EXPORT_SYMBOL(ptlrpc_set_add_cb); /** * Add a new request to the general purpose request set. @@ -1045,7 +1041,6 @@ void ptlrpc_set_add_new_req(struct ptlrpcd_ctl *pc, wake_up(&pc->pc_partners[i]->pc_set->set_waitq); } } -EXPORT_SYMBOL(ptlrpc_set_add_new_req); /** * Based on the current state of the import, determine if the request @@ -2036,7 +2031,6 @@ int ptlrpc_expired_set(void *data) */ RETURN(1); } -EXPORT_SYMBOL(ptlrpc_expired_set); /** * Sets rq_intr flag in \a req under spinlock. @@ -2053,7 +2047,7 @@ EXPORT_SYMBOL(ptlrpc_mark_interrupted); * Interrupts (sets interrupted flag) all uncompleted requests in * a set \a data. Callback for l_wait_event for interruptible waits. */ -void ptlrpc_interrupted_set(void *data) +static void ptlrpc_interrupted_set(void *data) { struct ptlrpc_request_set *set = data; struct list_head *tmp; @@ -2072,7 +2066,6 @@ void ptlrpc_interrupted_set(void *data) ptlrpc_mark_interrupted(req); } } -EXPORT_SYMBOL(ptlrpc_interrupted_set); /** * Get the smallest timeout in the set; this does NOT set a timeout. @@ -2123,7 +2116,6 @@ int ptlrpc_set_next_timeout(struct ptlrpc_request_set *set) } RETURN(timeout); } -EXPORT_SYMBOL(ptlrpc_set_next_timeout); /** * Send all unset request from the set and then wait untill all @@ -2325,7 +2317,6 @@ void ptlrpc_req_finished_with_imp_lock(struct ptlrpc_request *request) assert_spin_locked(&request->rq_import->imp_lock); (void)__ptlrpc_req_finished(request, 1); } -EXPORT_SYMBOL(ptlrpc_req_finished_with_imp_lock); /** * Helper function @@ -2382,7 +2373,7 @@ EXPORT_SYMBOL(ptlrpc_req_xid); * The request owner (i.e. the thread doing the I/O) must call... * Returns 0 on success or 1 if unregistering cannot be made. */ -int ptlrpc_unregister_reply(struct ptlrpc_request *request, int async) +static int ptlrpc_unregister_reply(struct ptlrpc_request *request, int async) { int rc; struct l_wait_info lwi; @@ -2454,7 +2445,6 @@ int ptlrpc_unregister_reply(struct ptlrpc_request *request, int async) } RETURN(0); } -EXPORT_SYMBOL(ptlrpc_unregister_reply); static void ptlrpc_free_request(struct ptlrpc_request *req) { @@ -2581,7 +2571,6 @@ void ptlrpc_cleanup_client(struct obd_import *imp) ENTRY; EXIT; } -EXPORT_SYMBOL(ptlrpc_cleanup_client); /** * Schedule previously sent request for resend. @@ -2619,7 +2608,6 @@ void ptlrpc_resend_req(struct ptlrpc_request *req) ptlrpc_client_wake_req(req); spin_unlock(&req->rq_lock); } -EXPORT_SYMBOL(ptlrpc_resend_req); /* XXX: this function and rq_status are currently unused */ void ptlrpc_restart_req(struct ptlrpc_request *req) @@ -2633,7 +2621,6 @@ void ptlrpc_restart_req(struct ptlrpc_request *req) ptlrpc_client_wake_req(req); spin_unlock(&req->rq_lock); } -EXPORT_SYMBOL(ptlrpc_restart_req); /** * Grab additional reference on a request \a req @@ -2701,7 +2688,6 @@ void ptlrpc_retain_replayable_request(struct ptlrpc_request *req, list_add(&req->rq_replay_list, &imp->imp_replay_list); } -EXPORT_SYMBOL(ptlrpc_retain_replayable_request); /** * Send request and wait until it completes. @@ -2871,7 +2857,6 @@ int ptlrpc_replay_req(struct ptlrpc_request *req) ptlrpcd_add_req(req, PDL_POLICY_LOCAL, -1); RETURN(0); } -EXPORT_SYMBOL(ptlrpc_replay_req); /** * Aborts all in-flight request on import \a imp sending and delayed lists @@ -2931,7 +2916,6 @@ void ptlrpc_abort_inflight(struct obd_import *imp) EXIT; } -EXPORT_SYMBOL(ptlrpc_abort_inflight); /** * Abort all uncompleted requests in request set \a set @@ -3020,7 +3004,6 @@ __u64 ptlrpc_next_xid(void) return next; } -EXPORT_SYMBOL(ptlrpc_next_xid); /** * Get a glimpse at what next xid value might have been. diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c index 7dc79e4..d6c1717 100644 --- a/lustre/ptlrpc/connection.c +++ b/lustre/ptlrpc/connection.c @@ -87,7 +87,6 @@ out: libcfs_nid2str(conn->c_peer.nid)); return conn; } -EXPORT_SYMBOL(ptlrpc_connection_get); int ptlrpc_connection_put(struct ptlrpc_connection *conn) { @@ -124,7 +123,6 @@ int ptlrpc_connection_put(struct ptlrpc_connection *conn) RETURN(rc); } -EXPORT_SYMBOL(ptlrpc_connection_put); struct ptlrpc_connection * ptlrpc_connection_addref(struct ptlrpc_connection *conn) @@ -138,7 +136,6 @@ ptlrpc_connection_addref(struct ptlrpc_connection *conn) RETURN(conn); } -EXPORT_SYMBOL(ptlrpc_connection_addref); int ptlrpc_connection_init(void) { @@ -156,14 +153,12 @@ int ptlrpc_connection_init(void) RETURN(0); } -EXPORT_SYMBOL(ptlrpc_connection_init); void ptlrpc_connection_fini(void) { ENTRY; cfs_hash_putref(conn_hash); EXIT; } -EXPORT_SYMBOL(ptlrpc_connection_fini); /* * Hash operations for net_peer<->connection diff --git a/lustre/ptlrpc/gss/gss_svc_upcall.c b/lustre/ptlrpc/gss/gss_svc_upcall.c index 017bc6b..9fa1622 100644 --- a/lustre/ptlrpc/gss/gss_svc_upcall.c +++ b/lustre/ptlrpc/gss/gss_svc_upcall.c @@ -749,7 +749,6 @@ void gss_secsvc_flush(struct obd_device *target) { rsc_flush_target(target); } -EXPORT_SYMBOL(gss_secsvc_flush); static struct rsc *gss_svc_searchbyctx(rawobj_t *handle) { diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index a48dbe2..224cad4 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -141,7 +141,6 @@ void deuuidify(char *uuid, const char *prefix, char **uuid_start, int *uuid_len) UUID_STR, strlen(UUID_STR))) *uuid_len -= strlen(UUID_STR); } -EXPORT_SYMBOL(deuuidify); /** * Returns true if import was FULL, false if import was already not @@ -439,7 +438,6 @@ void ptlrpc_fail_import(struct obd_import *imp, __u32 conn_cnt) } EXIT; } -EXPORT_SYMBOL(ptlrpc_fail_import); int ptlrpc_reconnect_import(struct obd_import *imp) { @@ -1578,7 +1576,6 @@ void ptlrpc_cleanup_imp(struct obd_import *imp) EXIT; } -EXPORT_SYMBOL(ptlrpc_cleanup_imp); /* Adaptive Timeout utils */ extern unsigned int at_min, at_max, at_history; diff --git a/lustre/ptlrpc/llog_server.c b/lustre/ptlrpc/llog_server.c index c8d8d46..b7a550d 100644 --- a/lustre/ptlrpc/llog_server.c +++ b/lustre/ptlrpc/llog_server.c @@ -114,7 +114,6 @@ out_ctxt: llog_ctxt_put(ctxt); return rc; } -EXPORT_SYMBOL(llog_origin_handle_open); int llog_origin_handle_destroy(struct ptlrpc_request *req) { @@ -154,7 +153,6 @@ int llog_origin_handle_destroy(struct ptlrpc_request *req) llog_ctxt_put(ctxt); RETURN(rc); } -EXPORT_SYMBOL(llog_origin_handle_destroy); int llog_origin_handle_next_block(struct ptlrpc_request *req) { @@ -215,7 +213,6 @@ out_ctxt: llog_ctxt_put(ctxt); return rc; } -EXPORT_SYMBOL(llog_origin_handle_next_block); int llog_origin_handle_prev_block(struct ptlrpc_request *req) { @@ -276,7 +273,6 @@ out_ctxt: llog_ctxt_put(ctxt); return rc; } -EXPORT_SYMBOL(llog_origin_handle_prev_block); int llog_origin_handle_read_header(struct ptlrpc_request *req) { @@ -331,7 +327,6 @@ out_ctxt: llog_ctxt_put(ctxt); return rc; } -EXPORT_SYMBOL(llog_origin_handle_read_header); int llog_origin_handle_close(struct ptlrpc_request *req) { @@ -344,4 +339,3 @@ int llog_origin_handle_close(struct ptlrpc_request *req) RETURN(err_serious(-ENOMEM)); RETURN(0); } -EXPORT_SYMBOL(llog_origin_handle_close); diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c index 4069d36..49d9584 100644 --- a/lustre/ptlrpc/niobuf.c +++ b/lustre/ptlrpc/niobuf.c @@ -241,7 +241,6 @@ int ptlrpc_start_bulk_transfer(struct ptlrpc_bulk_desc *desc) RETURN(0); } -EXPORT_SYMBOL(ptlrpc_start_bulk_transfer); /** * Server side bulk abort. Idempotent. Not thread-safe (i.e. only @@ -282,7 +281,6 @@ void ptlrpc_abort_bulk(struct ptlrpc_bulk_desc *desc) CWARN("Unexpectedly long timeout: desc %p\n", desc); } } -EXPORT_SYMBOL(ptlrpc_abort_bulk); #endif /* HAVE_SERVER_SUPPORT */ /** @@ -411,7 +409,6 @@ int ptlrpc_register_bulk(struct ptlrpc_request *req) RETURN(0); } -EXPORT_SYMBOL(ptlrpc_register_bulk); /** * Disconnect a bulk desc from the network. Idempotent. Not @@ -475,7 +472,6 @@ int ptlrpc_unregister_bulk(struct ptlrpc_request *req, int async) } RETURN(0); } -EXPORT_SYMBOL(ptlrpc_unregister_bulk); static void ptlrpc_at_set_reply(struct ptlrpc_request *req, int flags) { @@ -614,7 +610,6 @@ out: ptlrpc_connection_put(conn); return rc; } -EXPORT_SYMBOL(ptlrpc_send_reply); int ptlrpc_reply (struct ptlrpc_request *req) { @@ -623,7 +618,6 @@ int ptlrpc_reply (struct ptlrpc_request *req) else return (ptlrpc_send_reply(req, 0)); } -EXPORT_SYMBOL(ptlrpc_reply); /** * For request \a req send an error reply back. Create empty @@ -651,13 +645,11 @@ int ptlrpc_send_error(struct ptlrpc_request *req, int may_be_difficult) rc = ptlrpc_send_reply(req, may_be_difficult); RETURN(rc); } -EXPORT_SYMBOL(ptlrpc_send_error); int ptlrpc_error(struct ptlrpc_request *req) { return ptlrpc_send_error(req, 0); } -EXPORT_SYMBOL(ptlrpc_error); /** * Send request \a request. diff --git a/lustre/ptlrpc/nrs.c b/lustre/ptlrpc/nrs.c index 8d1f479..d844bc8 100644 --- a/lustre/ptlrpc/nrs.c +++ b/lustre/ptlrpc/nrs.c @@ -1283,7 +1283,6 @@ fail: RETURN(rc); } -EXPORT_SYMBOL(ptlrpc_nrs_policy_register); /** * Unregisters a previously registered policy with NRS core. All instances of @@ -1350,7 +1349,6 @@ not_exist: RETURN(rc); } -EXPORT_SYMBOL(ptlrpc_nrs_policy_unregister); /** * Setup NRS heads on all service partitions of service \a svc, and register diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c index 3e47d8a..267574a 100644 --- a/lustre/ptlrpc/pack_generic.c +++ b/lustre/ptlrpc/pack_generic.c @@ -70,7 +70,6 @@ __u32 lustre_msg_hdr_size(__u32 magic, __u32 count) return 0; } } -EXPORT_SYMBOL(lustre_msg_hdr_size); void ptlrpc_buf_set_swabbed(struct ptlrpc_request *req, const int inout, __u32 index) @@ -80,7 +79,6 @@ void ptlrpc_buf_set_swabbed(struct ptlrpc_request *req, const int inout, else lustre_set_rep_swabbed(req, index); } -EXPORT_SYMBOL(ptlrpc_buf_set_swabbed); int ptlrpc_buf_need_swab(struct ptlrpc_request *req, const int inout, __u32 index) @@ -92,7 +90,6 @@ int ptlrpc_buf_need_swab(struct ptlrpc_request *req, const int inout, return (ptlrpc_rep_need_swab(req) && !lustre_rep_swabbed(req, index)); } -EXPORT_SYMBOL(ptlrpc_buf_need_swab); static inline int lustre_msg_check_version_v2(struct lustre_msg_v2 *msg, __u32 version) @@ -114,7 +111,6 @@ int lustre_msg_check_version(struct lustre_msg *msg, __u32 version) return 0; } } -EXPORT_SYMBOL(lustre_msg_check_version); /* early reply size */ __u32 lustre_msg_early_size() @@ -174,7 +170,6 @@ __u32 lustre_msg_size(__u32 magic, int count, __u32 *lens) return 0; } } -EXPORT_SYMBOL(lustre_msg_size); /* This is used to determine the size of a buffer that was already packed * and will correctly handle the different message formats. */ @@ -188,7 +183,6 @@ __u32 lustre_packed_msg_size(struct lustre_msg *msg) return 0; } } -EXPORT_SYMBOL(lustre_packed_msg_size); void lustre_init_msg_v2(struct lustre_msg_v2 *msg, int count, __u32 *lens, char **bufs) @@ -256,7 +250,6 @@ int lustre_pack_request(struct ptlrpc_request *req, __u32 magic, int count, return -EINVAL; } } -EXPORT_SYMBOL(lustre_pack_request); #if RS_DEBUG struct list_head ptlrpc_rs_debug_lru = @@ -399,7 +392,6 @@ int lustre_pack_reply_flags(struct ptlrpc_request *req, int count, __u32 *lens, lustre_msg_size(req->rq_reqmsg->lm_magic, count, lens)); return rc; } -EXPORT_SYMBOL(lustre_pack_reply_flags); int lustre_pack_reply(struct ptlrpc_request *req, int count, __u32 *lens, char **bufs) @@ -522,7 +514,6 @@ void lustre_free_reply_state(struct ptlrpc_reply_state *rs) sptlrpc_svc_free_rs(rs); } -EXPORT_SYMBOL(lustre_free_reply_state); static int lustre_unpack_msg_v2(struct lustre_msg_v2 *m, int len) { @@ -610,7 +601,6 @@ int ptlrpc_unpack_req_msg(struct ptlrpc_request *req, int len) } return rc; } -EXPORT_SYMBOL(ptlrpc_unpack_req_msg); int ptlrpc_unpack_rep_msg(struct ptlrpc_request *req, int len) { @@ -622,7 +612,6 @@ int ptlrpc_unpack_rep_msg(struct ptlrpc_request *req, int len) } return rc; } -EXPORT_SYMBOL(ptlrpc_unpack_rep_msg); static inline int lustre_unpack_ptlrpc_body_v2(struct ptlrpc_request *req, const int inout, int offset) @@ -722,8 +711,6 @@ void lustre_msg_set_buflen(struct lustre_msg *m, __u32 n, __u32 len) } } -EXPORT_SYMBOL(lustre_msg_set_buflen); - /* NB return the bufcount for lustre_msg_v2 format, so if message is packed * in V1 format, the result is one bigger. (add struct ptlrpc_body). */ __u32 lustre_msg_bufcount(struct lustre_msg *m) @@ -736,7 +723,6 @@ __u32 lustre_msg_bufcount(struct lustre_msg *m) return 0; } } -EXPORT_SYMBOL(lustre_msg_bufcount); char *lustre_msg_string(struct lustre_msg *m, __u32 index, __u32 max_len) { @@ -782,7 +768,6 @@ char *lustre_msg_string(struct lustre_msg *m, __u32 index, __u32 max_len) return str; } -EXPORT_SYMBOL(lustre_msg_string); /* Wrap up the normal fixed length cases */ static inline void *__lustre_swab_buf(struct lustre_msg *msg, __u32 index, @@ -887,7 +872,6 @@ void lustre_msg_set_flags(struct lustre_msg *msg, __u32 flags) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } -EXPORT_SYMBOL(lustre_msg_set_flags); void lustre_msg_clear_flags(struct lustre_msg *msg, __u32 flags) { @@ -919,7 +903,6 @@ __u32 lustre_msg_get_op_flags(struct lustre_msg *msg) return 0; } } -EXPORT_SYMBOL(lustre_msg_get_op_flags); void lustre_msg_add_op_flags(struct lustre_msg *msg, __u32 flags) { @@ -949,7 +932,6 @@ void lustre_msg_set_op_flags(struct lustre_msg *msg, __u32 flags) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } -EXPORT_SYMBOL(lustre_msg_set_op_flags); struct lustre_handle *lustre_msg_get_handle(struct lustre_msg *msg) { @@ -967,7 +949,6 @@ struct lustre_handle *lustre_msg_get_handle(struct lustre_msg *msg) return NULL; } } -EXPORT_SYMBOL(lustre_msg_get_handle); __u32 lustre_msg_get_type(struct lustre_msg *msg) { @@ -1003,7 +984,6 @@ __u32 lustre_msg_get_version(struct lustre_msg *msg) return 0; } } -EXPORT_SYMBOL(lustre_msg_get_version); void lustre_msg_add_version(struct lustre_msg *msg, __u32 version) { @@ -1018,7 +998,6 @@ void lustre_msg_add_version(struct lustre_msg *msg, __u32 version) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } -EXPORT_SYMBOL(lustre_msg_add_version); __u32 lustre_msg_get_opc(struct lustre_msg *msg) { @@ -1055,7 +1034,6 @@ __u64 lustre_msg_get_last_xid(struct lustre_msg *msg) return 0; } } -EXPORT_SYMBOL(lustre_msg_get_last_xid); __u64 lustre_msg_get_last_committed(struct lustre_msg *msg) { @@ -1148,7 +1126,6 @@ __u64 lustre_msg_get_slv(struct lustre_msg *msg) return -EINVAL; } } -EXPORT_SYMBOL(lustre_msg_get_slv); void lustre_msg_set_slv(struct lustre_msg *msg, __u64 slv) @@ -1168,7 +1145,6 @@ void lustre_msg_set_slv(struct lustre_msg *msg, __u64 slv) return; } } -EXPORT_SYMBOL(lustre_msg_set_slv); __u32 lustre_msg_get_limit(struct lustre_msg *msg) { @@ -1186,7 +1162,6 @@ __u32 lustre_msg_get_limit(struct lustre_msg *msg) return -EINVAL; } } -EXPORT_SYMBOL(lustre_msg_get_limit); void lustre_msg_set_limit(struct lustre_msg *msg, __u64 limit) @@ -1206,7 +1181,6 @@ void lustre_msg_set_limit(struct lustre_msg *msg, __u64 limit) return; } } -EXPORT_SYMBOL(lustre_msg_set_limit); __u32 lustre_msg_get_conn_cnt(struct lustre_msg *msg) { @@ -1236,7 +1210,6 @@ int lustre_msg_is_v1(struct lustre_msg *msg) return 0; } } -EXPORT_SYMBOL(lustre_msg_is_v1); __u32 lustre_msg_get_magic(struct lustre_msg *msg) { @@ -1248,7 +1221,6 @@ __u32 lustre_msg_get_magic(struct lustre_msg *msg) return 0; } } -EXPORT_SYMBOL(lustre_msg_get_magic); __u32 lustre_msg_get_timeout(struct lustre_msg *msg) { @@ -1376,7 +1348,6 @@ void lustre_msg_set_handle(struct lustre_msg *msg, struct lustre_handle *handle) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } -EXPORT_SYMBOL(lustre_msg_set_handle); void lustre_msg_set_type(struct lustre_msg *msg, __u32 type) { @@ -1391,7 +1362,6 @@ void lustre_msg_set_type(struct lustre_msg *msg, __u32 type) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } -EXPORT_SYMBOL(lustre_msg_set_type); void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc) { @@ -1406,7 +1376,6 @@ void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } -EXPORT_SYMBOL(lustre_msg_set_opc); void lustre_msg_set_last_xid(struct lustre_msg *msg, __u64 last_xid) { @@ -1421,7 +1390,6 @@ void lustre_msg_set_last_xid(struct lustre_msg *msg, __u64 last_xid) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } -EXPORT_SYMBOL(lustre_msg_set_last_xid); void lustre_msg_set_last_committed(struct lustre_msg *msg, __u64 last_committed) { @@ -1436,7 +1404,6 @@ void lustre_msg_set_last_committed(struct lustre_msg *msg, __u64 last_committed) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } -EXPORT_SYMBOL(lustre_msg_set_last_committed); void lustre_msg_set_versions(struct lustre_msg *msg, __u64 *versions) { @@ -1501,7 +1468,6 @@ void lustre_msg_set_conn_cnt(struct lustre_msg *msg, __u32 conn_cnt) LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } } -EXPORT_SYMBOL(lustre_msg_set_conn_cnt); void lustre_msg_set_timeout(struct lustre_msg *msg, __u32 timeout) { @@ -1597,7 +1563,6 @@ void ptlrpc_req_set_repsize(struct ptlrpc_request *req, int count, __u32 *lens) if (req->rq_reqmsg->lm_magic == LUSTRE_MSG_MAGIC_V2) req->rq_reqmsg->lm_repsize = req->rq_replen; } -EXPORT_SYMBOL(ptlrpc_req_set_repsize); /** * Send a remote set_info_async. @@ -1680,7 +1645,6 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *b) * and ptlrpc_body_v2. */ CLASSERT(offsetof(typeof(*b), pb_jobid) != 0); } -EXPORT_SYMBOL(lustre_swab_ptlrpc_body); void lustre_swab_connect(struct obd_connect_data *ocd) { @@ -1780,7 +1744,6 @@ void lustre_swab_obd_statfs (struct obd_statfs *os) CLASSERT(offsetof(typeof(*os), os_spare8) != 0); CLASSERT(offsetof(typeof(*os), os_spare9) != 0); } -EXPORT_SYMBOL(lustre_swab_obd_statfs); void lustre_swab_obd_ioobj(struct obd_ioobj *ioo) { @@ -1788,7 +1751,6 @@ void lustre_swab_obd_ioobj(struct obd_ioobj *ioo) __swab32s(&ioo->ioo_max_brw); __swab32s(&ioo->ioo_bufcnt); } -EXPORT_SYMBOL(lustre_swab_obd_ioobj); void lustre_swab_niobuf_remote(struct niobuf_remote *nbr) { @@ -1796,25 +1758,21 @@ void lustre_swab_niobuf_remote(struct niobuf_remote *nbr) __swab32s(&nbr->rnb_len); __swab32s(&nbr->rnb_flags); } -EXPORT_SYMBOL(lustre_swab_niobuf_remote); void lustre_swab_ost_body (struct ost_body *b) { lustre_swab_obdo (&b->oa); } -EXPORT_SYMBOL(lustre_swab_ost_body); void lustre_swab_ost_last_id(u64 *id) { __swab64s(id); } -EXPORT_SYMBOL(lustre_swab_ost_last_id); void lustre_swab_generic_32s(__u32 *val) { __swab32s(val); } -EXPORT_SYMBOL(lustre_swab_generic_32s); void lustre_swab_gl_desc(union ldlm_gl_desc *desc) { @@ -1893,7 +1851,6 @@ void lustre_swab_mdt_body (struct mdt_body *b) __swab32s(&b->mbo_gid_h); CLASSERT(offsetof(typeof(*b), mbo_padding_5) != 0); } -EXPORT_SYMBOL(lustre_swab_mdt_body); void lustre_swab_mdt_ioepoch (struct mdt_ioepoch *b) { @@ -1902,7 +1859,6 @@ void lustre_swab_mdt_ioepoch (struct mdt_ioepoch *b) __swab32s (&b->flags); CLASSERT(offsetof(typeof(*b), padding) != 0); } -EXPORT_SYMBOL(lustre_swab_mdt_ioepoch); void lustre_swab_mgs_target_info(struct mgs_target_info *mti) { @@ -1917,7 +1873,6 @@ void lustre_swab_mgs_target_info(struct mgs_target_info *mti) for (i = 0; i < MTI_NIDS_MAX; i++) __swab64s(&mti->mti_nids[i]); } -EXPORT_SYMBOL(lustre_swab_mgs_target_info); void lustre_swab_mgs_nidtbl_entry(struct mgs_nidtbl_entry *entry) { @@ -1948,14 +1903,12 @@ void lustre_swab_mgs_config_body(struct mgs_config_body *body) __swab32s(&body->mcb_units); __swab16s(&body->mcb_type); } -EXPORT_SYMBOL(lustre_swab_mgs_config_body); void lustre_swab_mgs_config_res(struct mgs_config_res *body) { __swab64s(&body->mcr_offset); __swab64s(&body->mcr_size); } -EXPORT_SYMBOL(lustre_swab_mgs_config_res); static void lustre_swab_obd_dqinfo (struct obd_dqinfo *i) { @@ -1988,7 +1941,6 @@ void lustre_swab_obd_quotactl (struct obd_quotactl *q) lustre_swab_obd_dqinfo (&q->qc_dqinfo); lustre_swab_obd_dqblk (&q->qc_dqblk); } -EXPORT_SYMBOL(lustre_swab_obd_quotactl); void lustre_swab_mdt_remote_perm (struct mdt_remote_perm *p) { @@ -2035,7 +1987,6 @@ void lustre_swab_fiemap(struct ll_user_fiemap *fiemap) for (i = 0; i < fiemap->fm_mapped_extents; i++) lustre_swab_fiemap_extent(&fiemap->fm_extents[i]); } -EXPORT_SYMBOL(lustre_swab_fiemap); void lustre_swab_idx_info(struct idx_info *ii) { @@ -2087,7 +2038,6 @@ void lustre_swab_mdt_rec_reint (struct mdt_rec_reint *rr) CLASSERT(offsetof(typeof(*rr), rr_padding_4) != 0); }; -EXPORT_SYMBOL(lustre_swab_mdt_rec_reint); void lustre_swab_lov_desc (struct lov_desc *ld) { @@ -2137,7 +2087,6 @@ void lustre_swab_lmv_mds_md(union lmv_mds_md *lmm) break; } } -EXPORT_SYMBOL(lustre_swab_lmv_mds_md); void lustre_swab_lmv_user_md(struct lmv_user_md *lum) { @@ -2232,7 +2181,6 @@ void lustre_swab_lov_mds_md(struct lov_mds_md *lmm) __swab16s(&lmm->lmm_layout_gen); EXIT; } -EXPORT_SYMBOL(lustre_swab_lov_mds_md); void lustre_swab_lov_user_md_objects(struct lov_user_ost_data *lod, int stripe_count) @@ -2255,7 +2203,6 @@ void lustre_swab_ldlm_res_id (struct ldlm_res_id *id) for (i = 0; i < RES_NAME_SIZE; i++) __swab64s (&id->name[i]); } -EXPORT_SYMBOL(lustre_swab_ldlm_res_id); void lustre_swab_ldlm_policy_data (ldlm_wire_policy_data_t *d) { @@ -2268,13 +2215,11 @@ void lustre_swab_ldlm_policy_data (ldlm_wire_policy_data_t *d) __swab64s(&d->l_flock.lfw_owner); __swab32s(&d->l_flock.lfw_pid); } -EXPORT_SYMBOL(lustre_swab_ldlm_policy_data); void lustre_swab_ldlm_intent (struct ldlm_intent *i) { __swab64s (&i->opc); } -EXPORT_SYMBOL(lustre_swab_ldlm_intent); void lustre_swab_ldlm_resource_desc (struct ldlm_resource_desc *r) { @@ -2282,7 +2227,6 @@ void lustre_swab_ldlm_resource_desc (struct ldlm_resource_desc *r) CLASSERT(offsetof(typeof(*r), lr_padding) != 0); lustre_swab_ldlm_res_id (&r->lr_name); } -EXPORT_SYMBOL(lustre_swab_ldlm_resource_desc); void lustre_swab_ldlm_lock_desc (struct ldlm_lock_desc *l) { @@ -2291,7 +2235,6 @@ void lustre_swab_ldlm_lock_desc (struct ldlm_lock_desc *l) __swab32s (&l->l_granted_mode); lustre_swab_ldlm_policy_data (&l->l_policy_data); } -EXPORT_SYMBOL(lustre_swab_ldlm_lock_desc); void lustre_swab_ldlm_request (struct ldlm_request *rq) { @@ -2300,7 +2243,6 @@ void lustre_swab_ldlm_request (struct ldlm_request *rq) __swab32s (&rq->lock_count); /* lock_handle[] opaque */ } -EXPORT_SYMBOL(lustre_swab_ldlm_request); void lustre_swab_ldlm_reply (struct ldlm_reply *r) { @@ -2311,7 +2253,6 @@ void lustre_swab_ldlm_reply (struct ldlm_reply *r) __swab64s (&r->lock_policy_res1); __swab64s (&r->lock_policy_res2); } -EXPORT_SYMBOL(lustre_swab_ldlm_reply); void lustre_swab_quota_body(struct quota_body *b) { @@ -2331,14 +2272,12 @@ void dump_ioo(struct obd_ioobj *ioo) "ioo_bufct=%d\n", POSTID(&ioo->ioo_oid), ioo->ioo_max_brw, ioo->ioo_bufcnt); } -EXPORT_SYMBOL(dump_ioo); void dump_rniobuf(struct niobuf_remote *nb) { CDEBUG(D_RPCTRACE, "niobuf_remote: offset="LPU64", len=%d, flags=%x\n", nb->rnb_offset, nb->rnb_len, nb->rnb_flags); } -EXPORT_SYMBOL(dump_rniobuf); void dump_obdo(struct obdo *oa) { @@ -2402,19 +2341,16 @@ void dump_obdo(struct obdo *oa) CDEBUG(D_RPCTRACE, "obdo: o_lcookie = " "(llog_cookie dumping not yet implemented)\n"); } -EXPORT_SYMBOL(dump_obdo); void dump_ost_body(struct ost_body *ob) { dump_obdo(&ob->oa); } -EXPORT_SYMBOL(dump_ost_body); void dump_rcs(__u32 *rc) { CDEBUG(D_RPCTRACE, "rmf_rcs: %d\n", *rc); } -EXPORT_SYMBOL(dump_rcs); static inline int req_ptlrpc_body_swabbed(struct ptlrpc_request *req) { @@ -2501,7 +2437,6 @@ void lustre_swab_lustre_capa(struct lustre_capa *c) __swab32s (&c->lc_timeout); __swab32s (&c->lc_expiry); } -EXPORT_SYMBOL(lustre_swab_lustre_capa); void lustre_swab_lustre_capa_key(struct lustre_capa_key *k) { @@ -2509,14 +2444,12 @@ void lustre_swab_lustre_capa_key(struct lustre_capa_key *k) __swab32s (&k->lk_keyid); CLASSERT(offsetof(typeof(*k), lk_padding) != 0); } -EXPORT_SYMBOL(lustre_swab_lustre_capa_key); void lustre_swab_hsm_user_state(struct hsm_user_state *state) { __swab32s(&state->hus_states); __swab32s(&state->hus_archive_id); } -EXPORT_SYMBOL(lustre_swab_hsm_user_state); void lustre_swab_hsm_state_set(struct hsm_state_set *hss) { @@ -2525,7 +2458,6 @@ void lustre_swab_hsm_state_set(struct hsm_state_set *hss) __swab64s(&hss->hss_clearmask); __swab32s(&hss->hss_archive_id); } -EXPORT_SYMBOL(lustre_swab_hsm_state_set); static void lustre_swab_hsm_extent(struct hsm_extent *extent) { @@ -2539,14 +2471,12 @@ void lustre_swab_hsm_current_action(struct hsm_current_action *action) __swab32s(&action->hca_action); lustre_swab_hsm_extent(&action->hca_location); } -EXPORT_SYMBOL(lustre_swab_hsm_current_action); void lustre_swab_hsm_user_item(struct hsm_user_item *hui) { lustre_swab_lu_fid(&hui->hui_fid); lustre_swab_hsm_extent(&hui->hui_extent); } -EXPORT_SYMBOL(lustre_swab_hsm_user_item); void lustre_swab_layout_intent(struct layout_intent *li) { @@ -2555,7 +2485,6 @@ void lustre_swab_layout_intent(struct layout_intent *li) __swab64s(&li->li_start); __swab64s(&li->li_end); } -EXPORT_SYMBOL(lustre_swab_layout_intent); void lustre_swab_hsm_progress_kernel(struct hsm_progress_kernel *hpk) { @@ -2566,7 +2495,6 @@ void lustre_swab_hsm_progress_kernel(struct hsm_progress_kernel *hpk) __swab16s(&hpk->hpk_flags); __swab16s(&hpk->hpk_errval); } -EXPORT_SYMBOL(lustre_swab_hsm_progress_kernel); void lustre_swab_hsm_request(struct hsm_request *hr) { @@ -2576,7 +2504,6 @@ void lustre_swab_hsm_request(struct hsm_request *hr) __swab32s(&hr->hr_itemcount); __swab32s(&hr->hr_data_len); } -EXPORT_SYMBOL(lustre_swab_hsm_request); void lustre_swab_object_update(struct object_update *ou) { @@ -2599,7 +2526,6 @@ void lustre_swab_object_update(struct object_update *ou) object_update_param_size(param)); } } -EXPORT_SYMBOL(lustre_swab_object_update); void lustre_swab_object_update_request(struct object_update_request *our) { @@ -2616,7 +2542,6 @@ void lustre_swab_object_update_request(struct object_update_request *our) lustre_swab_object_update(ou); } } -EXPORT_SYMBOL(lustre_swab_object_update_request); void lustre_swab_object_update_result(struct object_update_result *our) { @@ -2624,7 +2549,6 @@ void lustre_swab_object_update_result(struct object_update_result *our) __swab16s(&our->our_datalen); __swab16s(&our->our_padding); } -EXPORT_SYMBOL(lustre_swab_object_update_result); void lustre_swab_object_update_reply(struct object_update_reply *our) { @@ -2643,20 +2567,17 @@ void lustre_swab_object_update_reply(struct object_update_reply *our) lustre_swab_object_update_result(ourp); } } -EXPORT_SYMBOL(lustre_swab_object_update_reply); void lustre_swab_swap_layouts(struct mdc_swap_layouts *msl) { __swab64s(&msl->msl_flags); } -EXPORT_SYMBOL(lustre_swab_swap_layouts); void lustre_swab_close_data(struct close_data *cd) { lustre_swab_lu_fid(&cd->cd_fid); __swab64s(&cd->cd_data_version); } -EXPORT_SYMBOL(lustre_swab_close_data); void lustre_swab_lfsck_request(struct lfsck_request *lr) { @@ -2676,7 +2597,6 @@ void lustre_swab_lfsck_request(struct lfsck_request *lr) CLASSERT(offsetof(typeof(*lr), lr_padding_1) != 0); CLASSERT(offsetof(typeof(*lr), lr_padding_2) != 0); } -EXPORT_SYMBOL(lustre_swab_lfsck_request); void lustre_swab_lfsck_reply(struct lfsck_reply *lr) { @@ -2684,7 +2604,6 @@ void lustre_swab_lfsck_reply(struct lfsck_reply *lr) CLASSERT(offsetof(typeof(*lr), lr_padding_1) != 0); CLASSERT(offsetof(typeof(*lr), lr_padding_2) != 0); } -EXPORT_SYMBOL(lustre_swab_lfsck_reply); void lustre_swab_orphan_ent(struct lu_orphan_ent *ent) { diff --git a/lustre/ptlrpc/pinger.c b/lustre/ptlrpc/pinger.c index 796adb4..a29283e 100644 --- a/lustre/ptlrpc/pinger.c +++ b/lustre/ptlrpc/pinger.c @@ -386,7 +386,6 @@ void ptlrpc_pinger_sending_on_import(struct obd_import *imp) { ptlrpc_update_next_ping(imp, 0); } -EXPORT_SYMBOL(ptlrpc_pinger_sending_on_import); void ptlrpc_pinger_commit_expected(struct obd_import *imp) { diff --git a/lustre/ptlrpc/ptlrpc_internal.h b/lustre/ptlrpc/ptlrpc_internal.h index 9db78ec..c236f07 100644 --- a/lustre/ptlrpc/ptlrpc_internal.h +++ b/lustre/ptlrpc/ptlrpc_internal.h @@ -80,6 +80,11 @@ void ptlrpc_request_cache_fini(void); struct ptlrpc_request *ptlrpc_request_cache_alloc(gfp_t flags); void ptlrpc_request_cache_free(struct ptlrpc_request *req); void ptlrpc_init_xid(void); +void ptlrpc_set_add_new_req(struct ptlrpcd_ctl *pc, + struct ptlrpc_request *req); +int ptlrpc_expired_set(void *data); +int ptlrpc_set_next_timeout(struct ptlrpc_request_set *); +void ptlrpc_resend_req(struct ptlrpc_request *request); /* events.c */ int ptlrpc_init_portals(void); diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c index a1cc412..1471d2c 100644 --- a/lustre/ptlrpc/ptlrpcd.c +++ b/lustre/ptlrpc/ptlrpcd.c @@ -177,7 +177,6 @@ void ptlrpcd_add_rqset(struct ptlrpc_request_set *set) wake_up(&pc->pc_partners[i]->pc_set->set_waitq); } } -EXPORT_SYMBOL(ptlrpcd_add_rqset); /** * Return transferred RPCs count. diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c index c7b09e8..495a20e 100644 --- a/lustre/ptlrpc/recover.c +++ b/lustre/ptlrpc/recover.c @@ -210,7 +210,6 @@ int ptlrpc_resend(struct obd_import *imp) RETURN(0); } -EXPORT_SYMBOL(ptlrpc_resend); /** * Go through all requests in delayed list and wake their threads @@ -230,7 +229,6 @@ void ptlrpc_wake_delayed(struct obd_import *imp) } spin_unlock(&imp->imp_lock); } -EXPORT_SYMBOL(ptlrpc_wake_delayed); void ptlrpc_request_handle_notconn(struct ptlrpc_request *failed_req) { diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c index 9c2d098..38890d8 100644 --- a/lustre/ptlrpc/sec_bulk.c +++ b/lustre/ptlrpc/sec_bulk.c @@ -680,7 +680,6 @@ void sptlrpc_enc_pool_put_pages(struct ptlrpc_bulk_desc *desc) desc->bd_iov_count * sizeof(*desc->bd_enc_iov)); desc->bd_enc_iov = NULL; } -EXPORT_SYMBOL(sptlrpc_enc_pool_put_pages); /* * we don't do much stuff for add_user/del_user anymore, except adding some @@ -828,13 +827,11 @@ const char * sptlrpc_get_hash_name(__u8 hash_alg) { return cfs_crypto_hash_name(cfs_hash_alg_id[hash_alg]); } -EXPORT_SYMBOL(sptlrpc_get_hash_name); __u8 sptlrpc_get_hash_alg(const char *algname) { return cfs_crypto_hash_alg(algname); } -EXPORT_SYMBOL(sptlrpc_get_hash_alg); int bulk_sec_desc_unpack(struct lustre_msg *msg, int offset, int swabbed) { @@ -921,4 +918,3 @@ int sptlrpc_get_bulk_checksum(struct ptlrpc_bulk_desc *desc, __u8 alg, return err; } -EXPORT_SYMBOL(sptlrpc_get_bulk_checksum); diff --git a/lustre/ptlrpc/sec_config.c b/lustre/ptlrpc/sec_config.c index 573e263..08576ca 100644 --- a/lustre/ptlrpc/sec_config.c +++ b/lustre/ptlrpc/sec_config.c @@ -88,7 +88,6 @@ enum lustre_sec_part sptlrpc_target_sec_part(struct obd_device *obd) CERROR("unknown target %p(%s)\n", obd, type); return LUSTRE_SP_ANY; } -EXPORT_SYMBOL(sptlrpc_target_sec_part); /**************************************** * user supplied flavor string parsing * @@ -286,7 +285,6 @@ int sptlrpc_rule_set_expand(struct sptlrpc_rule_set *rset) rset->srs_nslot = nslot; return 0; } -EXPORT_SYMBOL(sptlrpc_rule_set_expand); static inline int rule_spec_dir(struct sptlrpc_rule *rule) { @@ -434,7 +432,6 @@ int sptlrpc_rule_set_choose(struct sptlrpc_rule_set *rset, return 0; } -EXPORT_SYMBOL(sptlrpc_rule_set_choose); void sptlrpc_rule_set_dump(struct sptlrpc_rule_set *rset) { @@ -447,7 +444,6 @@ void sptlrpc_rule_set_dump(struct sptlrpc_rule_set *rset) r->sr_from, r->sr_to, r->sr_netid, r->sr_flvr.sf_rpc); } } -EXPORT_SYMBOL(sptlrpc_rule_set_dump); static int sptlrpc_rule_set_extract(struct sptlrpc_rule_set *gen, struct sptlrpc_rule_set *tgt, @@ -899,7 +895,6 @@ void sptlrpc_target_choose_flavor(struct sptlrpc_rule_set *rset, if (sptlrpc_rule_set_choose(rset, from, LUSTRE_SP_ANY, nid, sf) == 0) get_default_flavor(sf); } -EXPORT_SYMBOL(sptlrpc_target_choose_flavor); #define SEC_ADAPT_DELAY (10) @@ -1211,7 +1206,6 @@ out: mutex_unlock(&sptlrpc_conf_lock); RETURN(rc); } -EXPORT_SYMBOL(sptlrpc_conf_target_get_rules); int sptlrpc_conf_init(void) { diff --git a/lustre/ptlrpc/sec_gc.c b/lustre/ptlrpc/sec_gc.c index 12ea3f1..1b60971 100644 --- a/lustre/ptlrpc/sec_gc.c +++ b/lustre/ptlrpc/sec_gc.c @@ -77,7 +77,6 @@ void sptlrpc_gc_add_sec(struct ptlrpc_sec *sec) CDEBUG(D_SEC, "added sec %p(%s)\n", sec, sec->ps_policy->sp_name); } -EXPORT_SYMBOL(sptlrpc_gc_add_sec); void sptlrpc_gc_del_sec(struct ptlrpc_sec *sec) { @@ -101,7 +100,6 @@ void sptlrpc_gc_del_sec(struct ptlrpc_sec *sec) CDEBUG(D_SEC, "del sec %p(%s)\n", sec, sec->ps_policy->sp_name); } -EXPORT_SYMBOL(sptlrpc_gc_del_sec); void sptlrpc_gc_add_ctx(struct ptlrpc_cli_ctx *ctx) { diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index 8f8ce0b..04a65cb 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -431,7 +431,6 @@ void ptlrpc_commit_replies(struct obd_export *exp) rs_batch_fini(&batch); EXIT; } -EXPORT_SYMBOL(ptlrpc_commit_replies); static int ptlrpc_server_post_idle_rqbds(struct ptlrpc_service_part *svcpt) @@ -1110,7 +1109,6 @@ void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay) EXIT; } -EXPORT_SYMBOL(ptlrpc_update_export_timer); /** * Sanity check request \a req. @@ -2753,7 +2751,6 @@ void ptlrpc_stop_all_threads(struct ptlrpc_service *svc) EXIT; } -EXPORT_SYMBOL(ptlrpc_stop_all_threads); int ptlrpc_start_threads(struct ptlrpc_service *svc) { @@ -2785,7 +2782,6 @@ int ptlrpc_start_threads(struct ptlrpc_service *svc) ptlrpc_stop_all_threads(svc); RETURN(rc); } -EXPORT_SYMBOL(ptlrpc_start_threads); int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait) { -- 1.8.3.1