AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-27 20:02:21 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: lustre: remove EXIT macro

Browse Source 
We have a kernel-wide function tracing system, so use that instead of
rolling a custom one just for one filesystem.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-08-03 06:01:58 +08:00
parent e05e02e420
commit 23f14e79ac
91 changed files with 4 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
View File

@ -309,11 +309,6 @@ do { \
# error "Unkown compiler"
#endif /* __GNUC__ */
#define EXIT \
do { \
CDEBUG(D_TRACE, "Process leaving\n"); \
} while(0)
extern int libcfs_debug_msg(struct libcfs_debug_msg_data *msgdata,
const char *format1, ...)
__attribute__ ((format (printf, 2, 3)));

6
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
View File

@ -400,8 +400,6 @@ ksocknal_tx_done (lnet_ni_t *ni, ksock_tx_t *tx)
ksocknal_free_tx (tx);
if (lnetmsg != NULL) /* KSOCK_MSG_NOOP go without lnetmsg */
lnet_finalize (ni, lnetmsg, rc);
EXIT;
}
void
@ -1577,8 +1575,6 @@ void ksocknal_read_callback (ksock_conn_t *conn)
wake_up (&sched->kss_waitq);
}
spin_unlock_bh(&sched->kss_lock);
EXIT;
}
/*
@ -1607,8 +1603,6 @@ void ksocknal_write_callback (ksock_conn_t *conn)
}
spin_unlock_bh(&sched->kss_lock);
EXIT;
}
ksock_proto_t *

2
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c
View File

@ -977,8 +977,6 @@ ksocknal_data_ready (struct sock *sk, int n)
ksocknal_read_callback(conn);
read_unlock(&ksocknal_data.ksnd_global_lock);
EXIT;
}
static void

1
drivers/staging/lustre/lnet/lnet/lib-msg.c
View File

@ -52,7 +52,6 @@ lnet_build_unlink_event (lnet_libmd_t *md, lnet_event_t *ev)
ev->type = LNET_EVENT_UNLINK;
lnet_md_deconstruct(md, &ev->md);
lnet_md2handle(&ev->md_handle, md);
EXIT;
}
/*

3
drivers/staging/lustre/lustre/fid/fid_request.c
View File

@ -133,7 +133,6 @@ static int seq_client_rpc(struct lu_client_seq *seq,
CDEBUG_LIMIT(debug_mask, "%s: Allocated %s-sequence "DRANGE"]\n",
seq->lcs_name, opcname, PRANGE(output));
EXIT;
out_req:
ptlrpc_req_finished(req);
return rc;
@ -407,7 +406,6 @@ static void seq_client_proc_fini(struct lu_client_seq *seq)
lprocfs_remove(&seq->lcs_proc_dir);
seq->lcs_proc_dir = NULL;
}
EXIT;
#endif /* LPROCFS */
}
@ -495,7 +493,6 @@ void seq_client_fini(struct lu_client_seq *seq)
}
seq->lcs_srv = NULL;
EXIT;
}
EXPORT_SYMBOL(seq_client_fini);

8
drivers/staging/lustre/lustre/fld/fld_cache.c
View File

@ -118,8 +118,6 @@ void fld_cache_fini(struct fld_cache *cache)
CDEBUG(D_INFO, " Cache hits: "LPU64"%%\n", pct);
OBD_FREE_PTR(cache);
EXIT;
}
/**
@ -196,8 +194,6 @@ static void fld_fix_new_list(struct fld_cache *cache)
c_range->lsr_end == n_range->lsr_end)
fld_cache_entry_delete(cache, f_curr);
}
EXIT;
}
/**
@ -255,8 +251,6 @@ void fld_cache_flush(struct fld_cache *cache)
cache->fci_cache_size = 0;
fld_cache_shrink(cache);
write_unlock(&cache->fci_lock);
EXIT;
}
/**
@ -276,7 +270,6 @@ void fld_cache_punch_hole(struct fld_cache *cache,
OBD_ALLOC_GFP(fldt, sizeof *fldt, GFP_ATOMIC);
if (!fldt) {
OBD_FREE_PTR(f_new);
EXIT;
/* overlap is not allowed, so dont mess up list. */
return;
}
@ -299,7 +292,6 @@ void fld_cache_punch_hole(struct fld_cache *cache,
fld_cache_entry_add(cache, fldt, &f_new->fce_list);
/* no need to fixup */
EXIT;
}
/**

5
drivers/staging/lustre/lustre/fld/fld_request.c
View File

@ -316,7 +316,6 @@ void fld_client_proc_fini(struct lu_client_fld *fld)
lprocfs_remove(&fld->lcf_proc_dir);
fld->lcf_proc_dir = NULL;
}
EXIT;
}
#else
static int fld_client_proc_init(struct lu_client_fld *fld)
@ -377,7 +376,6 @@ int fld_client_init(struct lu_client_fld *fld,
rc = fld_client_proc_init(fld);
if (rc)
GOTO(out, rc);
EXIT;
out:
if (rc)
fld_client_fini(fld);
@ -408,8 +406,6 @@ void fld_client_fini(struct lu_client_fld *fld)
fld_cache_fini(fld->lcf_cache);
fld->lcf_cache = NULL;
}
EXIT;
}
EXPORT_SYMBOL(fld_client_fini);
@ -458,7 +454,6 @@ int fld_client_rpc(struct obd_export *exp,
if (prange == NULL)
GOTO(out_req, rc = -EFAULT);
*range = *prange;
EXIT;
out_req:
ptlrpc_req_finished(req);
return rc;

1
drivers/staging/lustre/lustre/include/lustre_cfg.h
View File

@ -253,7 +253,6 @@ static inline void lustre_cfg_free(struct lustre_cfg *lcfg)
len = lustre_cfg_len(lcfg->lcfg_bufcount, lcfg->lcfg_buflens);
OBD_FREE(lcfg, len);
EXIT;
return;
}

1
drivers/staging/lustre/lustre/include/lustre_lib.h
View File

@ -261,7 +261,6 @@ int obd_ioctl_popdata(void *arg, void *data, int len);
static inline void obd_ioctl_freedata(char *buf, int len)
{
OBD_FREE_LARGE(buf, len);
EXIT;
return;
}

4
drivers/staging/lustre/lustre/include/lustre_mdc.h
View File

@ -124,7 +124,7 @@ static inline void mdc_put_rpc_lock(struct mdc_rpc_lock *lck,
{
if (it != NULL && (it->it_op == IT_GETATTR || it->it_op == IT_LOOKUP ||
it->it_op == IT_LAYOUT))
goto out;
return;
if (lck->rpcl_it == MDC_FAKE_RPCL_IT) { /* OBD_FAIL_MDC_RPCS_SEM */
mutex_lock(&lck->rpcl_mutex);
@ -141,8 +141,6 @@ static inline void mdc_put_rpc_lock(struct mdc_rpc_lock *lck,
}
mutex_unlock(&lck->rpcl_mutex);
out:
EXIT;
}
static inline void mdc_update_max_ea_from_body(struct obd_export *exp,

6
drivers/staging/lustre/lustre/include/obd_class.h
View File

@ -649,8 +649,6 @@ static inline void obd_cleanup_client_import(struct obd_device *obd)
obd->u.cli.cl_import = NULL;
}
up_write(&obd->u.cli.cl_sem);
EXIT;
}
static inline int
@ -1099,7 +1097,6 @@ static inline void obd_getref(struct obd_device *obd)
OBD_COUNTER_INCREMENT(obd, getref);
OBP(obd, getref)(obd);
}
EXIT;
}
static inline void obd_putref(struct obd_device *obd)
@ -1108,7 +1105,6 @@ static inline void obd_putref(struct obd_device *obd)
OBD_COUNTER_INCREMENT(obd, putref);
OBP(obd, putref)(obd);
}
EXIT;
}
static inline int obd_init_export(struct obd_export *exp)
@ -1525,14 +1521,12 @@ static inline void obd_import_event(struct obd_device *obd,
{
if (!obd) {
CERROR("NULL device\n");
EXIT;
return;
}
if (obd->obd_set_up && OBP(obd, import_event)) {
OBD_COUNTER_INCREMENT(obd, import_event);
OBP(obd, import_event)(obd, imp, event);
}
EXIT;
}
static inline int obd_llog_connect(struct obd_export *exp,

1
drivers/staging/lustre/lustre/lclient/lcommon_cl.c
View File

@ -674,7 +674,6 @@ void ccc_lock_state(const struct lu_env *env,
lock->cll_descr.cld_end == CL_PAGE_EOF)
cl_merge_lvb(env, inode);
}
EXIT;
}
/*****************************************************************************

4
drivers/staging/lustre/lustre/ldlm/interval_tree.c
View File

@ -361,7 +361,6 @@ static void interval_insert_color(struct interval_node *node,
}
(*root)->in_color = INTERVAL_BLACK;
EXIT;
}
struct interval_node *interval_insert(struct interval_node *node,
@ -476,7 +475,6 @@ static void interval_erase_color(struct interval_node *node,
}
if (node)
node->in_color = INTERVAL_BLACK;
EXIT;
}
/*
@ -498,7 +496,6 @@ static void update_maxhigh(struct interval_node *node,
break;
node = node->in_parent;
}
EXIT;
}
void interval_erase(struct interval_node *node,
@ -570,7 +567,6 @@ void interval_erase(struct interval_node *node,
color:
if (color == INTERVAL_BLACK)
interval_erase_color(child, parent, root);
EXIT;
}
EXPORT_SYMBOL(interval_erase);

4
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
View File

@ -160,7 +160,6 @@ ldlm_flock_destroy(struct ldlm_lock *lock, ldlm_mode_t mode, __u64 flags)
}
ldlm_lock_destroy_nolock(lock);
EXIT;
}
/**
@ -553,8 +552,6 @@ ldlm_flock_interrupted_wait(void *data)
/* client side - set flag to prevent lock from being put on LRU list */
lock->l_flags |= LDLM_FL_CBPENDING;
unlock_res_and_lock(lock);
EXIT;
}
/**
@ -840,6 +837,5 @@ void ldlm_destroy_flock_export(struct obd_export *exp)
cfs_hash_putref(exp->exp_flock_hash);
exp->exp_flock_hash = NULL;
}
EXIT;
}
EXPORT_SYMBOL(ldlm_destroy_flock_export);

7
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
View File

@ -525,8 +525,6 @@ int client_connect_import(const struct lu_env *env,
ptlrpc_pinger_add_import(imp);
EXIT;
if (rc) {
out_ldlm:
cli->cl_conn_count--;
@ -597,8 +595,6 @@ int client_disconnect_export(struct obd_export *exp)
ptlrpc_invalidate_import(imp);
EXIT;
out_disconnect:
/* Use server style - class_disconnect should be always called for
* o_disconnect. */
@ -667,7 +663,6 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
struct obd_export *exp;
if (req->rq_no_reply) {
EXIT;
return;
}
@ -676,7 +671,6 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
if (rs == NULL || !rs->rs_difficult) {
/* no notifiers */
target_send_reply_msg (req, rc, fail_id);
EXIT;
return;
}
@ -747,7 +741,6 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
}
spin_unlock(&rs->rs_lock);
spin_unlock(&svcpt->scp_rep_lock);
EXIT;
}
EXPORT_SYMBOL(target_send_reply);

30
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
View File

@ -218,8 +218,6 @@ void ldlm_lock_put(struct ldlm_lock *lock)
lu_ref_fini(&lock->l_reference);
OBD_FREE_RCU(lock, sizeof(*lock), &lock->l_handle);
}
EXIT;
}
EXPORT_SYMBOL(ldlm_lock_put);
@ -259,7 +257,6 @@ int ldlm_lock_remove_from_lru(struct ldlm_lock *lock)
spin_lock(&ns->ns_lock);
rc = ldlm_lock_remove_from_lru_nolock(lock);
spin_unlock(&ns->ns_lock);
EXIT;
return rc;
}
@ -289,7 +286,6 @@ void ldlm_lock_add_to_lru(struct ldlm_lock *lock)
spin_lock(&ns->ns_lock);
ldlm_lock_add_to_lru_nolock(lock);
spin_unlock(&ns->ns_lock);
EXIT;
}
/**
@ -302,7 +298,6 @@ void ldlm_lock_touch_in_lru(struct ldlm_lock *lock)
if (lock->l_flags & LDLM_FL_NS_SRV) {
LASSERT(list_empty(&lock->l_lru));
EXIT;
return;
}
@ -312,7 +307,6 @@ void ldlm_lock_touch_in_lru(struct ldlm_lock *lock)
ldlm_lock_add_to_lru_nolock(lock);
}
spin_unlock(&ns->ns_lock);
EXIT;
}
/**
@ -348,7 +342,6 @@ int ldlm_lock_destroy_internal(struct ldlm_lock *lock)
if (lock->l_flags & LDLM_FL_DESTROYED) {
LASSERT(list_empty(&lock->l_lru));
EXIT;
return 0;
}
lock->l_flags |= LDLM_FL_DESTROYED;
@ -376,7 +369,6 @@ int ldlm_lock_destroy_internal(struct ldlm_lock *lock)
if (lock->l_export && lock->l_completion_ast)
lock->l_completion_ast(lock, 0);
#endif
EXIT;
return 1;
}
@ -396,7 +388,6 @@ void ldlm_lock_destroy(struct ldlm_lock *lock)
lu_ref_del(&lock->l_reference, "hash", lock);
LDLM_LOCK_RELEASE(lock);
}
EXIT;
}
/**
@ -412,7 +403,6 @@ void ldlm_lock_destroy_nolock(struct ldlm_lock *lock)
lu_ref_del(&lock->l_reference, "hash", lock);
LDLM_LOCK_RELEASE(lock);
}
EXIT;
}
/* this is called by portals_handle2object with the handle lock taken */
@ -723,7 +713,6 @@ void ldlm_add_ast_work_item(struct ldlm_lock *lock, struct ldlm_lock *new,
ldlm_add_bl_work_item(lock, new, work_list);
else
ldlm_add_cp_work_item(lock, work_list);
EXIT;
}
/**
@ -902,8 +891,6 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode)
LDLM_DEBUG(lock, "do not add lock into lru list");
unlock_res_and_lock(lock);
}
EXIT;
}
/**
@ -985,7 +972,6 @@ static void search_granted_lock(struct list_head *queue,
prev->res_link = &mode_end->l_res_link;
prev->mode_link = &mode_end->l_sl_mode;
prev->policy_link = &req->l_sl_policy;
EXIT;
return;
} else if (lock->l_resource->lr_type == LDLM_IBITS) {
for (;;) {
@ -1004,7 +990,6 @@ static void search_granted_lock(struct list_head *queue,
&policy_end->l_sl_mode;
prev->policy_link =
&policy_end->l_sl_policy;
EXIT;
return;
}
@ -1023,7 +1008,6 @@ static void search_granted_lock(struct list_head *queue,
prev->res_link = &mode_end->l_res_link;
prev->mode_link = &mode_end->l_sl_mode;
prev->policy_link = &req->l_sl_policy;
EXIT;
return;
} else {
LDLM_ERROR(lock,"is not LDLM_PLAIN or LDLM_IBITS lock");
@ -1036,7 +1020,6 @@ static void search_granted_lock(struct list_head *queue,
prev->res_link = queue->prev;
prev->mode_link = &req->l_sl_mode;
prev->policy_link = &req->l_sl_policy;
EXIT;
return;
}
@ -1073,8 +1056,6 @@ static void ldlm_granted_list_add_lock(struct ldlm_lock *lock,
list_add(&lock->l_sl_mode, prev->mode_link);
if (&lock->l_sl_policy != prev->policy_link)
list_add(&lock->l_sl_policy, prev->policy_link);
EXIT;
}
/**
@ -1089,7 +1070,6 @@ static void ldlm_grant_lock_with_skiplist(struct ldlm_lock *lock)
search_granted_lock(&lock->l_resource->lr_granted, lock, &prev);
ldlm_granted_list_add_lock(lock, &prev);
EXIT;
}
/**
@ -1124,7 +1104,6 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list)
ldlm_add_ast_work_item(lock, NULL, work_list);
ldlm_pool_add(&ldlm_res_to_ns(res)->ns_pool, lock);
EXIT;
}
/**
@ -1322,7 +1301,6 @@ ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags,
if (lock != NULL)
GOTO(out, rc = 1);
EXIT;
out:
unlock_res(res);
LDLM_RESOURCE_DELREF(res);
@ -1424,8 +1402,6 @@ ldlm_mode_t ldlm_revalidate_lock_handle(struct lustre_handle *lockh,
ldlm_lock_addref_internal_nolock(lock, mode);
}
EXIT;
out:
if (lock != NULL) {
unlock_res_and_lock(lock);
@ -1936,7 +1912,6 @@ void ldlm_reprocess_all_ns(struct ldlm_namespace *ns)
cfs_hash_for_each_nolock(ns->ns_rs_hash,
ldlm_reprocess_res, NULL);
}
EXIT;
}
EXPORT_SYMBOL(ldlm_reprocess_all_ns);
@ -1957,7 +1932,6 @@ void ldlm_reprocess_all(struct ldlm_resource *res)
"LDLM_NAMESPACE_SERVER resource type lock.\n");
LBUG();
}
EXIT;
}
/**
@ -2035,8 +2009,6 @@ void ldlm_lock_cancel(struct ldlm_lock *lock)
* if not to zero out lock->l_granted_mode */
lock->l_granted_mode = LCK_MINMODE;
unlock_res_and_lock(lock);
EXIT;
}
EXPORT_SYMBOL(ldlm_lock_cancel);
@ -2142,8 +2114,6 @@ void ldlm_lock_downgrade(struct ldlm_lock *lock, int new_mode)
ldlm_grant_lock(lock, NULL);
unlock_res_and_lock(lock);
ldlm_reprocess_all(lock->l_resource);
EXIT;
}
EXPORT_SYMBOL(ldlm_lock_downgrade);

6
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
View File

@ -171,7 +171,6 @@ void ldlm_handle_bl_callback(struct ldlm_namespace *ns,
LDLM_DEBUG(lock, "client blocking callback handler END");
LDLM_LOCK_RELEASE(lock);
EXIT;
}
/**
@ -353,12 +352,10 @@ static void ldlm_handle_gl_callback(struct ptlrpc_request *req,
if (ldlm_bl_to_thread_lock(ns, NULL, lock))
ldlm_handle_bl_callback(ns, NULL, lock);
EXIT;
return;
}
unlock_res_and_lock(lock);
LDLM_LOCK_RELEASE(lock);
EXIT;
}
static int ldlm_callback_reply(struct ptlrpc_request *req, int rc)
@ -933,8 +930,6 @@ void ldlm_put_ref(void)
ldlm_refcount--;
}
mutex_unlock(&ldlm_ref_mutex);
EXIT;
}
EXPORT_SYMBOL(ldlm_put_ref);
@ -1031,7 +1026,6 @@ void ldlm_destroy_export(struct obd_export *exp)
exp->exp_lock_hash = NULL;
ldlm_destroy_flock_export(exp);
EXIT;
}
EXPORT_SYMBOL(ldlm_destroy_export);

4
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
View File

@ -810,7 +810,6 @@ static int ldlm_pool_proc_init(struct ldlm_pool *pl)
"recalc_timing", "sec");
rc = lprocfs_register_stats(pl->pl_proc_dir, "stats", pl->pl_stats);
EXIT;
out_free_name:
OBD_FREE(var_name, MAX_STRING_SIZE + 1);
return rc;
@ -877,7 +876,6 @@ void ldlm_pool_fini(struct ldlm_pool *pl)
* any abnormal using cases.
*/
POISON(pl, 0x5a, sizeof(*pl));
EXIT;
}
EXPORT_SYMBOL(ldlm_pool_fini);
@ -1370,7 +1368,6 @@ static int ldlm_pools_thread_start(void)
static void ldlm_pools_thread_stop(void)
{
if (ldlm_pools_thread == NULL) {
EXIT;
return;
}
@ -1385,7 +1382,6 @@ static void ldlm_pools_thread_stop(void)
wait_for_completion(&ldlm_pools_comp);
OBD_FREE_PTR(ldlm_pools_thread);
ldlm_pools_thread = NULL;
EXIT;
}
int ldlm_pools_init(void)

5
drivers/staging/lustre/lustre/ldlm/ldlm_request.c
View File

@ -456,7 +456,6 @@ int ldlm_cli_enqueue_local(struct ldlm_namespace *ns,
lock->l_completion_ast(lock, *flags, NULL);
LDLM_DEBUG(lock, "client-side local enqueue handler, new lock created");
EXIT;
out:
LDLM_LOCK_RELEASE(lock);
out_nolock:
@ -689,7 +688,6 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req,
}
LDLM_DEBUG(lock, "client-side enqueue END");
EXIT;
cleanup:
if (cleanup_phase == 1 && rc)
failed_lock_cleanup(ns, lock, mode);
@ -1083,7 +1081,6 @@ int ldlm_cli_convert(struct lustre_handle *lockh, int new_mode, __u32 *flags)
} else {
rc = LUSTRE_EDEADLK;
}
EXIT;
out:
LDLM_LOCK_PUT(lock);
ptlrpc_req_finished(req);
@ -1168,7 +1165,6 @@ static void ldlm_cancel_pack(struct ptlrpc_request *req,
packed++;
}
CDEBUG(D_DLMTRACE, "%d locks packed\n", packed);
EXIT;
}
/**
@ -1253,7 +1249,6 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct list_head *cancels,
}
ptlrpc_req_finished(req);
EXIT;
out:
return sent ? sent : rc;
}

4
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
View File

@ -862,7 +862,6 @@ void ldlm_namespace_free_prior(struct ldlm_namespace *ns,
int rc;
if (!ns) {
EXIT;
return;
}
@ -887,7 +886,6 @@ void ldlm_namespace_free_prior(struct ldlm_namespace *ns,
rc = __ldlm_namespace_free(ns, 1);
LASSERT(rc == 0);
}
EXIT;
}
/**
@ -898,7 +896,6 @@ void ldlm_namespace_free_prior(struct ldlm_namespace *ns,
void ldlm_namespace_free_post(struct ldlm_namespace *ns)
{
if (!ns) {
EXIT;
return;
}
@ -917,7 +914,6 @@ void ldlm_namespace_free_post(struct ldlm_namespace *ns)
LASSERT(list_empty(&ns->ns_list_chain));
OBD_FREE_PTR(ns);
ldlm_put_ref();
EXIT;
}
/**

2
drivers/staging/lustre/lustre/libcfs/hash.c
View File

@ -1149,8 +1149,6 @@ cfs_hash_destroy(cfs_hash_t *hs)
i = cfs_hash_with_bigname(hs) ?
CFS_HASH_BIGNAME_LEN : CFS_HASH_NAME_LEN;
LIBCFS_FREE(hs, offsetof(cfs_hash_t, hs_name[i]));
EXIT;
}
cfs_hash_t *cfs_hash_getref(cfs_hash_t *hs)

2
drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
View File

@ -95,8 +95,6 @@ void libcfs_run_debug_log_upcall(char *file)
CDEBUG(D_HA, "Invoked LNET debug log upcall %s %s\n",
argv[0], argv[1]);
}
EXIT;
}
void libcfs_run_upcall(char **argv)

3
drivers/staging/lustre/lustre/libcfs/upcall_cache.c
View File

@ -273,7 +273,6 @@ void upcall_cache_put_entry(struct upcall_cache *cache,
struct upcall_cache_entry *entry)
{
if (!entry) {
EXIT;
return;
}
@ -281,7 +280,6 @@ void upcall_cache_put_entry(struct upcall_cache *cache,
spin_lock(&cache->uc_lock);
put_entry(cache, entry);
spin_unlock(&cache->uc_lock);
EXIT;
}
EXPORT_SYMBOL(upcall_cache_put_entry);
@ -374,7 +372,6 @@ static void cache_flush(struct upcall_cache *cache, int force)
}
}
spin_unlock(&cache->uc_lock);
EXIT;
}
void upcall_cache_flush_idle(struct upcall_cache *cache)

5
drivers/staging/lustre/lustre/llite/dcache.c
View File

@ -73,8 +73,6 @@ static void ll_release(struct dentry *de)
LASSERT(lld->lld_mnt_count == 0);
de->d_fsdata = NULL;
call_rcu(&lld->lld_rcu_head, free_dentry_data);
EXIT;
}
/* Compare if two dentries are the same. Don't match if the existing dentry
@ -267,7 +265,6 @@ void ll_intent_release(struct lookup_intent *it)
it->d.lustre.it_disposition = 0;
it->d.lustre.it_data = NULL;
EXIT;
}
void ll_invalidate_aliases(struct inode *inode)
@ -298,8 +295,6 @@ void ll_invalidate_aliases(struct inode *inode)
d_lustre_invalidate(dentry, 0);
}
ll_unlock_dcache(inode);
EXIT;
}
int ll_revalidate_it_finish(struct ptlrpc_request *request,

4
drivers/staging/lustre/lustre/llite/dir.c
View File

@ -237,7 +237,6 @@ static int ll_dir_filler(void *_hash, struct page *page0)
if (page_pool != &page0)
OBD_FREE(page_pool, sizeof(struct page *) * max_pages);
EXIT;
return rc;
}
@ -1300,7 +1299,6 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
GOTO(out_free, rc);
}
ptlrpc_req_finished(request);
EXIT;
out_free:
obd_ioctl_freedata(buf, len);
return rc;
@ -1522,7 +1520,6 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
GOTO(out_req, rc = -EFAULT);
}
EXIT;
out_req:
ptlrpc_req_finished(request);
if (filename)
@ -1587,7 +1584,6 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (copy_to_user(&lumd->lmd_st, &st, sizeof(st)))
GOTO(free_lsm, rc = -EFAULT);
EXIT;
free_lsm:
obd_free_memmd(sbi->ll_dt_exp, &lsm);
free_lmm:

7
drivers/staging/lustre/lustre/llite/file.c
View File

@ -111,7 +111,6 @@ static void ll_prepare_close(struct inode *inode, struct md_op_data *op_data,
ll_pack_inode2opdata(inode, op_data, &och->och_fh);
ll_prep_md_op_data(op_data, inode, NULL, NULL,
0, 0, LUSTRE_OPC_ANY, NULL);
EXIT;
}
static int ll_close_inode_openhandle(struct obd_export *md_exp,
@ -177,9 +176,7 @@ static int ll_close_inode_openhandle(struct obd_export *md_exp,
inode->i_ino, rc);
}
EXIT;
out:
if (exp_connect_som(exp) && !epoch_close &&
S_ISREG(inode->i_mode) && (och->och_flags & FMODE_WRITE)) {
ll_queue_done_writing(inode, LLIF_DONE_WRITING);
@ -1690,7 +1687,6 @@ int ll_data_version(struct inode *inode, __u64 *data_version,
}
OBD_FREE_PTR(obdo);
EXIT;
out:
ccc_inode_lsm_put(inode, lsm);
RETURN(rc);
@ -2939,8 +2935,6 @@ static int ll_layout_fetch(struct inode *inode, struct ldlm_lock *lock)
lock->l_lvb_len = lmmsize;
unlock_res_and_lock(lock);
EXIT;
out:
ptlrpc_req_finished(req);
return rc;
@ -3029,7 +3023,6 @@ static int ll_layout_lock_set(struct lustre_handle *lockh, ldlm_mode_t mode,
/* refresh layout failed, need to wait */
wait_layout = rc == -EBUSY;
EXIT;
out:
LDLM_LOCK_PUT(lock);

1
drivers/staging/lustre/lustre/llite/llite_capa.c
View File

@ -568,7 +568,6 @@ int ll_update_capa(struct obd_capa *ocapa, struct lustre_capa *capa)
if (capa_for_oss(capa))
inode_add_oss_capa(inode, ocapa);
DEBUG_CAPA(D_SEC, capa, "renew");
EXIT;
retry:
list_del_init(&ocapa->c_list);
sort_add_capa(ocapa, ll_capa_list);

7
drivers/staging/lustre/lustre/llite/llite_close.c
View File

@ -56,7 +56,6 @@ void vvp_write_pending(struct ccc_object *club, struct ccc_page *page)
list_add(&page->cpg_pending_linkage,
&club->cob_pending_list);
spin_unlock(&lli->lli_lock);
EXIT;
}
/** records that a write has completed */
@ -73,7 +72,6 @@ void vvp_write_complete(struct ccc_object *club, struct ccc_page *page)
spin_unlock(&lli->lli_lock);
if (rc)
ll_queue_done_writing(club->cob_inode, 0);
EXIT;
}
/** Queues DONE_WRITING if
@ -116,7 +114,6 @@ void ll_queue_done_writing(struct inode *inode, unsigned long flags)
spin_unlock(&lcq->lcq_lock);
}
spin_unlock(&lli->lli_lock);
EXIT;
}
/** Pack SOM attributes info @opdata for CLOSE, DONE_WRITING rpc. */
@ -136,7 +133,6 @@ void ll_done_writing_attr(struct inode *inode, struct md_op_data *op_data)
op_data->op_attr.ia_valid |= ATTR_MTIME_SET | ATTR_CTIME_SET |
ATTR_ATIME_SET | ATTR_SIZE | ATTR_BLOCKS;
}
EXIT;
}
/** Closes ioepoch and packs Size-on-MDS attribute if needed into @op_data. */
@ -204,7 +200,6 @@ void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data,
spin_unlock(&lli->lli_lock);
ll_done_writing_attr(inode, op_data);
EXIT;
out:
return;
}
@ -293,7 +288,6 @@ static void ll_done_writing(struct inode *inode)
OBD_ALLOC_PTR(op_data);
if (op_data == NULL) {
CERROR("can't allocate op_data\n");
EXIT;
return;
}
@ -317,7 +311,6 @@ static void ll_done_writing(struct inode *inode)
md_clear_open_replay_data(ll_i2sbi(inode)->ll_md_exp, och);
OBD_FREE_PTR(och);
}
EXIT;
}
static struct ll_inode_info *ll_close_next_lli(struct ll_close_queue *lcq)

20
drivers/staging/lustre/lustre/llite/llite_lib.c
View File

@ -152,7 +152,6 @@ void ll_free_sbi(struct super_block *sb)
spin_unlock(&ll_sb_lock);
OBD_FREE(sbi, sizeof(*sbi));
}
EXIT;
}
static struct dentry_operations ll_d_root_ops = {
@ -700,8 +699,6 @@ void client_common_put_super(struct super_block *sb)
obd_fid_fini(sbi->ll_md_exp->exp_obd);
obd_disconnect(sbi->ll_md_exp);
sbi->ll_md_exp = NULL;
EXIT;
}
void ll_kill_super(struct super_block *sb)
@ -720,7 +717,6 @@ void ll_kill_super(struct super_block *sb)
sb->s_dev = sbi->ll_sdev_orig;
sbi->ll_umounting = 1;
}
EXIT;
}
char *ll_read_opt(const char *opt, char *data)
@ -1112,8 +1108,6 @@ void ll_put_super(struct super_block *sb)
lustre_common_put_super(sb);
module_put(THIS_MODULE);
EXIT;
} /* client_put_super */
struct inode *ll_inode_from_resource_lock(struct ldlm_lock *lock)
@ -1227,8 +1221,6 @@ void ll_clear_inode(struct inode *inode)
*/
cl_inode_fini(inode);
lli->lli_has_smd = false;
EXIT;
}
int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data,
@ -1469,7 +1461,6 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr)
* setting times to past, but it is necessary due to possible
* time de-synchronization between MDT inode and OST objects */
rc = ll_setattr_ost(inode, attr);
EXIT;
out:
if (op_data) {
if (op_data->op_ioepoch) {
@ -1803,21 +1794,16 @@ void ll_read_inode2(struct inode *inode, void *opaque)
inode->i_op = &ll_file_inode_operations;
inode->i_fop = sbi->ll_fop;
inode->i_mapping->a_ops = (struct address_space_operations *)&ll_aops;
EXIT;
} else if (S_ISDIR(inode->i_mode)) {
inode->i_op = &ll_dir_inode_operations;
inode->i_fop = &ll_dir_operations;
EXIT;
} else if (S_ISLNK(inode->i_mode)) {
inode->i_op = &ll_fast_symlink_inode_operations;
EXIT;
} else {
inode->i_op = &ll_special_inode_operations;
init_special_inode(inode, inode->i_mode,
inode->i_rdev);
EXIT;
}
}
@ -1847,8 +1833,6 @@ void ll_delete_inode(struct inode *inode)
ll_clear_inode(inode);
clear_inode(inode);
EXIT;
}
int ll_iocontrol(struct inode *inode, struct file *file,
@ -1974,7 +1958,6 @@ void ll_umount_begin(struct super_block *sb)
if (obd == NULL) {
CERROR("Invalid MDC connection handle "LPX64"\n",
sbi->ll_md_exp->exp_handle.h_cookie);
EXIT;
return;
}
obd->obd_force = 1;
@ -1983,7 +1966,6 @@ void ll_umount_begin(struct super_block *sb)
if (obd == NULL) {
CERROR("Invalid LOV connection handle "LPX64"\n",
sbi->ll_dt_exp->exp_handle.h_cookie);
EXIT;
return;
}
obd->obd_force = 1;
@ -2004,8 +1986,6 @@ void ll_umount_begin(struct super_block *sb)
* schedule() and sleep one second if needed, and hope.
*/
schedule();
EXIT;
}
int ll_remount_fs(struct super_block *sb, int *flags, char *data)

3
drivers/staging/lustre/lustre/llite/llite_mmap.c
View File

@ -249,7 +249,6 @@ static int ll_page_mkwrite0(struct vm_area_struct *vma, struct page *vmpage,
spin_unlock(&lli->lli_lock);
}
}
EXIT;
out_io:
cl_io_fini(env, io);
@ -432,7 +431,6 @@ static void ll_vm_open(struct vm_area_struct * vma)
LASSERT(vma->vm_file);
LASSERT(atomic_read(&vob->cob_mmap_cnt) >= 0);
atomic_inc(&vob->cob_mmap_cnt);
EXIT;
}
/**
@ -446,7 +444,6 @@ static void ll_vm_close(struct vm_area_struct *vma)
LASSERT(vma->vm_file);
atomic_dec(&vob->cob_mmap_cnt);
LASSERT(atomic_read(&vob->cob_mmap_cnt) >= 0);
EXIT;
}

2
drivers/staging/lustre/lustre/llite/llite_nfs.c
View File

@ -245,8 +245,6 @@ static int ll_get_name(struct dentry *dentry, char *name,
mutex_unlock(&dir->i_mutex);
if (!rc && !lgd.lgd_found)
rc = -ENOENT;
EXIT;
out:
return rc;
}

3
drivers/staging/lustre/lustre/llite/namei.c
View File

@ -714,7 +714,6 @@ static struct inode *ll_create_node(struct inode *dir, const char *name,
CDEBUG(D_DLMTRACE, "setting l_ast_data to inode %p (%lu/%u)\n",
inode, inode->i_ino, inode->i_generation);
ll_set_lock_data(sbi->ll_md_exp, inode, it, NULL);
EXIT;
out:
ptlrpc_req_finished(request);
return inode;
@ -814,7 +813,6 @@ static int ll_new_node(struct inode *dir, struct qstr *name,
d_instantiate(dchild, inode);
}
EXIT;
err_exit:
ptlrpc_req_finished(request);
@ -923,7 +921,6 @@ static int ll_link_generic(struct inode *src, struct inode *dir,
ll_update_times(request, dir);
ll_stats_ops_tally(sbi, LPROC_LL_LINK, 1);
EXIT;
out:
ptlrpc_req_finished(request);
RETURN(err);

1
drivers/staging/lustre/lustre/llite/rw.c
View File

@ -1123,7 +1123,6 @@ void ras_update(struct ll_sb_info *sbi, struct inode *inode,
if ((ras->ras_consecutive_requests > 1 || stride_detect) &&
!ras->ras_request_index)
ras_increase_window(inode, ras, ra);
EXIT;
out_unlock:
RAS_CDEBUG(ras);
ras->ras_request_index++;

15
drivers/staging/lustre/lustre/llite/statahead.c
View File

@ -547,8 +547,6 @@ static void ll_sai_put(struct ll_statahead_info *sai)
iput(inode);
OBD_FREE_PTR(sai);
}
EXIT;
}
/* Do NOT forget to drop inode refcount when into sai_entries_agl. */
@ -609,8 +607,6 @@ static void ll_agl_trigger(struct inode *inode, struct ll_statahead_info *sai)
PFID(&lli->lli_fid), index, rc);
iput(inode);
EXIT;
}
static void ll_post_statahead(struct ll_statahead_info *sai)
@ -685,8 +681,6 @@ static void ll_post_statahead(struct ll_statahead_info *sai)
if (agl_should_run(sai, child))
ll_agl_add(sai, child, entry->se_index);
EXIT;
out:
/* The "ll_sa_entry_to_stated()" will drop related ldlm ibits lock
* reference count by calling "ll_intent_drop_lock()" in spite of the
@ -757,8 +751,6 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,
wake_up(&sai->sai_thread.t_ctl_waitq);
}
EXIT;
out:
if (rc != 0) {
ll_intent_release(it);
@ -956,8 +948,6 @@ static void ll_statahead_one(struct dentry *parent, const char* entry_name,
sai->sai_index++;
/* drop one refcount on entry by ll_sa_entry_alloc */
ll_sa_entry_put(sai, entry);
EXIT;
}
static int ll_agl_thread(void *arg)
@ -1044,7 +1034,6 @@ static void ll_start_agl(struct dentry *parent, struct ll_statahead_info *sai)
l_wait_event(thread->t_ctl_waitq,
thread_is_running(thread) || thread_is_stopped(thread),
&lwi);
EXIT;
}
static int ll_statahead_thread(void *arg)
@ -1245,7 +1234,6 @@ static int ll_statahead_thread(void *arg)
*/
}
}
EXIT;
out:
if (sai->sai_agl_valid) {
@ -1455,7 +1443,6 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
ll_release_page(page, 1);
}
}
EXIT;
out:
ll_dir_chain_fini(&chain);
@ -1502,8 +1489,6 @@ ll_sai_unplug(struct ll_statahead_info *sai, struct ll_sa_entry *entry)
if (!thread_is_stopped(thread))
wake_up(&thread->t_ctl_waitq);
EXIT;
}
/**

1
drivers/staging/lustre/lustre/llite/vvp_io.c
View File

@ -764,7 +764,6 @@ static int vvp_io_fault_start(const struct lu_env *env,
lu_ref_add(&page->cp_reference, "fault", io);
fio->ft_page = page;
EXIT;
out:
/* return unlocked vmpage to avoid deadlocking */

3
drivers/staging/lustre/lustre/llite/vvp_page.c
View File

@ -288,8 +288,6 @@ static void vvp_page_completion_read(const struct lu_env *env,
if (page->cp_sync_io == NULL)
unlock_page(vmpage);
EXIT;
}
static void vvp_page_completion_write(const struct lu_env *env,
@ -326,7 +324,6 @@ static void vvp_page_completion_write(const struct lu_env *env,
vvp_vmpage_error(ccc_object_inode(pg->cp_obj), vmpage, ioret);
end_page_writeback(vmpage);
EXIT;
}
/**

1
drivers/staging/lustre/lustre/llite/xattr.c
View File

@ -413,7 +413,6 @@ int ll_getxattr_common(struct inode *inode, const char *name,
memcpy(buffer, xdata, body->eadatasize);
rc = body->eadatasize;
}
EXIT;
out:
ptlrpc_req_finished(req);
return rc;

1
drivers/staging/lustre/lustre/lmv/lmv_intent.c
View File

@ -140,7 +140,6 @@ static int lmv_intent_remote(struct obd_export *exp, void *lmm,
it->d.lustre.it_lock_handle = plock.cookie;
it->d.lustre.it_lock_mode = pmode;
EXIT;
out_free_op_data:
OBD_FREE_PTR(op_data);
out:

4
drivers/staging/lustre/lustre/lmv/lmv_obd.c
View File

@ -118,7 +118,6 @@ static int lmv_set_mdc_active(struct lmv_obd *lmv, struct obd_uuid *uuid,
CDEBUG(D_INFO, "Marking OBD %p %sactive\n", obd,
activate ? "" : "in");
lmv_activate_target(lmv, tgt, activate);
EXIT;
out_lmv_lock:
spin_unlock(&lmv->lmv_lock);
@ -1267,7 +1266,6 @@ int __lmv_fid_alloc(struct lmv_obd *lmv, struct lu_fid *fid,
rc = 0;
}
EXIT;
out:
mutex_unlock(&tgt->ltd_fid_mutex);
return rc;
@ -1457,7 +1455,6 @@ static int lmv_statfs(const struct lu_env *env, struct obd_export *exp,
}
}
EXIT;
out_free_temp:
OBD_FREE(temp, sizeof(*temp));
return rc;
@ -1764,7 +1761,6 @@ lmv_enqueue_remote(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
rc = md_enqueue(tgt->ltd_exp, einfo, it, rdata, lockh,
lmm, lmmsize, NULL, extra_lock_flags);
OBD_FREE_PTR(rdata);
EXIT;
out:
ldlm_lock_decref(&plock, pmode);
return rc;

2
drivers/staging/lustre/lustre/lov/lov_dev.c
View File

@ -124,7 +124,6 @@ static void lov_req_completion(const struct lu_env *env,
lr = cl2lov_req(slice);
OBD_SLAB_FREE_PTR(lr, lov_req_kmem);
EXIT;
}
static const struct cl_req_operations lov_req_ops = {
@ -314,7 +313,6 @@ static void lov_cl_del_target(const struct lu_env *env, struct lu_device *dev,
cl_stack_fini(env, lovsub2cl_dev(ld->ld_target[index]));
ld->ld_target[index] = NULL;
}
EXIT;
}
static struct lov_device_emerg **lov_emerg_alloc(int nr)

7
drivers/staging/lustre/lustre/lov/lov_io.c
View File

@ -78,7 +78,6 @@ static void lov_io_sub_fini(const struct lu_env *env, struct lov_io *lio,
cl_env_put(sub->sub_env, &sub->sub_refcheck);
sub->sub_env = NULL;
}
EXIT;
}
static void lov_io_sub_inherit(struct cl_io *io, struct lov_io *lio,
@ -345,8 +344,6 @@ static void lov_io_slice_init(struct lov_io *lio,
default:
LBUG();
}
EXIT;
}
static void lov_io_fini(const struct lu_env *env, const struct cl_io_slice *ios)
@ -366,7 +363,6 @@ static void lov_io_fini(const struct lu_env *env, const struct cl_io_slice *ios)
LASSERT(atomic_read(&lov->lo_active_ios) > 0);
if (atomic_dec_and_test(&lov->lo_active_ios))
wake_up_all(&lov->lo_waitq);
EXIT;
}
static obd_off lov_offset_mod(obd_off val, int delta)
@ -524,7 +520,6 @@ static void lov_io_iter_fini(const struct lu_env *env,
LASSERT(rc == 0);
while (!list_empty(&lio->lis_active))
list_del_init(lio->lis_active.next);
EXIT;
}
static void lov_io_unlock(const struct lu_env *env,
@ -534,7 +529,6 @@ static void lov_io_unlock(const struct lu_env *env,
rc = lov_io_call(env, cl2lov_io(env, ios), lov_io_unlock_wrapper);
LASSERT(rc == 0);
EXIT;
}
@ -820,7 +814,6 @@ static void lov_empty_io_fini(const struct lu_env *env,
if (atomic_dec_and_test(&lov->lo_active_ios))
wake_up_all(&lov->lo_waitq);
EXIT;
}
static void lov_empty_impossible(const struct lu_env *env,

6
drivers/staging/lustre/lustre/lov/lov_lock.c
View File

@ -131,7 +131,6 @@ static void lov_sublock_adopt(const struct lu_env *env, struct lov_lock *lck,
rc = lov_sublock_modify(env, lck, lsl, &sublock->cll_descr, idx);
LASSERT(rc == 0); /* there is no way this can fail, currently */
EXIT;
}
static struct cl_lock *lov_sublock_alloc(const struct lu_env *env,
@ -188,7 +187,6 @@ static void lov_sublock_unlock(const struct lu_env *env,
lov_sublock_env_put(subenv);
lsl->lss_active = NULL;
cl_lock_disclosure(env, closure);
EXIT;
}
static int lov_sublock_lock(const struct lu_env *env,
@ -458,7 +456,6 @@ static void lov_sublock_hold(const struct lu_env *env, struct lov_lock *lck,
cl_lock_user_add(env, sublock);
cl_lock_put(env, sublock);
}
EXIT;
}
static void lov_lock_fini(const struct lu_env *env,
@ -480,7 +477,6 @@ static void lov_lock_fini(const struct lu_env *env,
lck->lls_nr * sizeof lck->lls_sub[0]);
}
OBD_SLAB_FREE_PTR(lck, lov_lock_kmem);
EXIT;
}
static int lov_lock_enqueue_wait(const struct lu_env *env,
@ -1052,7 +1048,6 @@ void lov_lock_unlink(const struct lu_env *env,
lu_ref_del(&parent->cll_reference, "lov-child", sub->lss_cl.cls_lock);
cl_lock_put(env, parent);
OBD_SLAB_FREE_PTR(link, lov_lock_link_kmem);
EXIT;
}
struct lov_lock_link *lov_lock_link_find(const struct lu_env *env,
@ -1123,7 +1118,6 @@ static void lov_lock_delete(const struct lu_env *env,
}
cl_lock_closure_fini(closure);
EXIT;
}
static int lov_lock_print(const struct lu_env *env, void *cookie,

6
drivers/staging/lustre/lustre/lov/lov_object.c
View File

@ -374,8 +374,6 @@ static void lov_fini_raid0(const struct lu_env *env, struct lov_object *lov,
dump_lsm(D_INODE, lov->lo_lsm);
lov_free_memmd(&lov->lo_lsm);
EXIT;
}
static void lov_fini_released(const struct lu_env *env, struct lov_object *lov,
@ -383,7 +381,6 @@ static void lov_fini_released(const struct lu_env *env, struct lov_object *lov,
{
dump_lsm(D_INODE, lov->lo_lsm);
lov_free_memmd(&lov->lo_lsm);
EXIT;
}
static int lov_print_empty(const struct lu_env *env, void *cookie,
@ -767,7 +764,6 @@ static int lov_conf_set(const struct lu_env *env, struct cl_object *obj,
}
lov->lo_layout_invalid = lov_layout_change(env, lov, conf);
EXIT;
out:
lov_conf_unlock(lov);
@ -779,7 +775,6 @@ static void lov_object_delete(const struct lu_env *env, struct lu_object *obj)
struct lov_object *lov = lu2lov(obj);
LOV_2DISPATCH_VOID(lov, llo_delete, env, lov, &lov->u);
EXIT;
}
static void lov_object_free(const struct lu_env *env, struct lu_object *obj)
@ -789,7 +784,6 @@ static void lov_object_free(const struct lu_env *env, struct lu_object *obj)
LOV_2DISPATCH_VOID(lov, llo_fini, env, lov, &lov->u);
lu_object_fini(obj);
OBD_SLAB_FREE_PTR(lov, lov_object_kmem);
EXIT;
}
static int lov_object_print(const struct lu_env *env, void *cookie,

2
drivers/staging/lustre/lustre/lov/lov_page.c
View File

@ -77,7 +77,6 @@ static void lov_page_fini(const struct lu_env *env,
slice->cpl_page->cp_child = NULL;
cl_page_put(env, sub);
}
EXIT;
}
static int lov_page_own(const struct lu_env *env,
@ -201,7 +200,6 @@ int lov_page_init_raid0(const struct lu_env *env, struct cl_object *obj,
LASSERT(0);
}
EXIT;
out:
return rc;
}

7
drivers/staging/lustre/lustre/lov/lov_pool.c
View File

@ -68,7 +68,6 @@ void lov_pool_putref(struct pool_desc *pool)
lov_ost_pool_free(&(pool->pool_rr.lqr_pool));
lov_ost_pool_free(&(pool->pool_obds));
OBD_FREE_PTR(pool);
EXIT;
}
}
@ -333,7 +332,6 @@ int lov_ost_pool_init(struct ost_pool *op, unsigned int count)
op->op_size = 0;
RETURN(-ENOMEM);
}
EXIT;
return 0;
}
@ -379,7 +377,6 @@ int lov_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count)
/* ost not found we add it */
op->op_array[op->op_count] = idx;
op->op_count++;
EXIT;
out:
up_write(&op->op_rw_sem);
return rc;
@ -397,7 +394,6 @@ int lov_ost_pool_remove(struct ost_pool *op, __u32 idx)
(op->op_count - i - 1) * sizeof(op->op_array[0]));
op->op_count--;
up_write(&op->op_rw_sem);
EXIT;
return 0;
}
}
@ -571,7 +567,6 @@ int lov_pool_add(struct obd_device *obd, char *poolname, char *ostname)
CDEBUG(D_CONFIG, "Added %s to "LOV_POOLNAMEF" as member %d\n",
ostname, poolname, pool_tgt_count(pool));
EXIT;
out:
obd_putref(obd);
lov_pool_putref(pool);
@ -616,7 +611,6 @@ int lov_pool_remove(struct obd_device *obd, char *poolname, char *ostname)
CDEBUG(D_CONFIG, "%s removed from "LOV_POOLNAMEF"\n", ostname,
poolname);
EXIT;
out:
obd_putref(obd);
lov_pool_putref(pool);
@ -640,7 +634,6 @@ int lov_check_index_in_pool(__u32 idx, struct pool_desc *pool)
GOTO(out, rc = 0);
}
rc = -ENOENT;
EXIT;
out:
up_read(&pool_tgt_rw_sem(pool));

1
drivers/staging/lustre/lustre/lov/lov_request.c
View File

@ -86,7 +86,6 @@ void lov_finish_set(struct lov_request_set *set)
lov_llh_put(set->set_lockh);
OBD_FREE(set, sizeof(*set));
EXIT;
}
int lov_set_finished(struct lov_request_set *set, int idempotent)

2
drivers/staging/lustre/lustre/lov/lovsub_dev.c
View File

@ -57,7 +57,6 @@ static void lovsub_req_completion(const struct lu_env *env,
lsr = cl2lovsub_req(slice);
OBD_SLAB_FREE_PTR(lsr, lovsub_req_kmem);
EXIT;
}
/**
@ -78,7 +77,6 @@ static void lovsub_req_attr_set(const struct lu_env *env,
* unconditionally. It never changes anyway.
*/
attr->cra_oa->o_stripe_idx = subobj->lso_index;
EXIT;
}
static const struct cl_req_operations lovsub_req_ops = {

6
drivers/staging/lustre/lustre/lov/lovsub_lock.c
View File

@ -60,7 +60,6 @@ static void lovsub_lock_fini(const struct lu_env *env,
lsl = cl2lovsub_lock(slice);
LASSERT(list_empty(&lsl->lss_parents));
OBD_SLAB_FREE_PTR(lsl, lovsub_lock_kmem);
EXIT;
}
static void lovsub_parent_lock(const struct lu_env *env, struct lov_lock *lov)
@ -71,7 +70,6 @@ static void lovsub_parent_lock(const struct lu_env *env, struct lov_lock *lov)
cl_lock_get(parent);
lu_ref_add(&parent->cll_reference, "lovsub-parent", current);
cl_lock_mutex_get(env, parent);
EXIT;
}
static void lovsub_parent_unlock(const struct lu_env *env, struct lov_lock *lov)
@ -82,7 +80,6 @@ static void lovsub_parent_unlock(const struct lu_env *env, struct lov_lock *lov)
cl_lock_mutex_put(env, lov->lls_cl.cls_lock);
lu_ref_del(&parent->cll_reference, "lovsub-parent", current);
cl_lock_put(env, parent);
EXIT;
}
/**
@ -109,7 +106,6 @@ static void lovsub_lock_state(const struct lu_env *env,
lovsub_parent_unlock(env, lov);
}
}
EXIT;
}
/**
@ -177,7 +173,6 @@ static void lovsub_lock_descr_map(const struct cl_lock_descr *in,
}
out->cld_start = start;
out->cld_end = end;
EXIT;
}
/**
@ -422,7 +417,6 @@ static void lovsub_lock_delete(const struct lu_env *env,
}
}
} while (restart);
EXIT;
}
static int lovsub_lock_print(const struct lu_env *env, void *cookie,

1
drivers/staging/lustre/lustre/lov/lovsub_object.c
View File

@ -92,7 +92,6 @@ static void lovsub_object_free(const struct lu_env *env, struct lu_object *obj)
lu_object_fini(obj);
lu_object_header_fini(&los->lso_header.coh_lu);
OBD_SLAB_FREE_PTR(los, lovsub_object_kmem);
EXIT;
}
static int lovsub_object_print(const struct lu_env *env, void *cookie,

1
drivers/staging/lustre/lustre/mdc/mdc_locks.c
View File

@ -1167,7 +1167,6 @@ static int mdc_intent_getattr_async_interpret(const struct lu_env *env,
GOTO(out, rc);
rc = mdc_finish_intent_lock(exp, req, &minfo->mi_data, it, lockh);
EXIT;
out:
OBD_FREE_PTR(einfo);

10
drivers/staging/lustre/lustre/mdc/mdc_request.c
View File

@ -139,7 +139,6 @@ static int send_getstatus(struct obd_import *imp, struct lu_fid *rootfid,
"root fid="DFID", last_committed="LPU64"\n",
PFID(rootfid),
lustre_msg_get_last_committed(req->rq_repmsg));
EXIT;
out:
ptlrpc_req_finished(req);
return rc;
@ -597,7 +596,6 @@ int mdc_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req,
md->oss_capa = oc;
}
EXIT;
out:
if (rc) {
if (md->oss_capa) {
@ -637,7 +635,6 @@ void mdc_replay_open(struct ptlrpc_request *req)
if (mod == NULL) {
DEBUG_REQ(D_ERROR, req,
"Can't properly replay without open data.");
EXIT;
return;
}
@ -671,7 +668,6 @@ void mdc_replay_open(struct ptlrpc_request *req)
DEBUG_REQ(D_HA, close_req, "updating close body with new fh");
epoch->handle = body->handle;
}
EXIT;
}
void mdc_commit_open(struct ptlrpc_request *req)
@ -1096,7 +1092,6 @@ static int mdc_statfs(const struct lu_env *env,
GOTO(out, rc = -EPROTO);
*osfs = *msfs;
EXIT;
out:
ptlrpc_req_finished(req);
output:
@ -1249,7 +1244,6 @@ static int mdc_ioc_hsm_current_action(struct obd_export *exp,
*hca = *req_hca;
EXIT;
out:
ptlrpc_req_finished(req);
return rc;
@ -1313,7 +1307,6 @@ static int mdc_ioc_hsm_state_get(struct obd_export *exp,
*hus = *req_hus;
EXIT;
out:
ptlrpc_req_finished(req);
return rc;
@ -1354,7 +1347,6 @@ static int mdc_ioc_hsm_state_set(struct obd_export *exp,
rc = mdc_queue_wait(req);
GOTO(out, rc);
EXIT;
out:
ptlrpc_req_finished(req);
return rc;
@ -1702,7 +1694,6 @@ static int mdc_ioc_swap_layouts(struct obd_export *exp,
rc = ptlrpc_queue_wait(req);
if (rc)
GOTO(out, rc);
EXIT;
out:
ptlrpc_req_finished(req);
@ -2558,7 +2549,6 @@ static int mdc_interpret_renew_capa(const struct lu_env *env,
capa = req_capsule_server_get(&req->rq_pill, &RMF_CAPA2);
if (!capa)
GOTO(out, capa = ERR_PTR(-EFAULT));
EXIT;
out:
ra->ra_cb(ra->ra_oc, capa);
return 0;

6
drivers/staging/lustre/lustre/mgc/mgc_request.c
View File

@ -149,8 +149,6 @@ static void config_log_put(struct config_llog_data *cld)
class_export_put(cld->cld_mgcexp);
OBD_FREE(cld, sizeof(*cld) + strlen(cld->cld_logname) + 1);
}
EXIT;
}
/* Find a config log by name */
@ -451,8 +449,6 @@ static void do_requeue(struct config_llog_data *cld)
cld->cld_logname);
}
up_read(&cld->cld_mgcexp->exp_obd->u.cli.cl_sem);
EXIT;
}
/* this timeout represents how many seconds MGC should wait before
@ -579,7 +575,6 @@ static void mgc_requeue_add(struct config_llog_data *cld)
spin_unlock(&config_list_lock);
wake_up(&rq_waitq);
}
EXIT;
}
/********************** class fns **********************/
@ -1596,7 +1591,6 @@ static int mgc_process_cfg_log(struct obd_device *mgc,
be updated here. */
rc = class_config_parse_llog(NULL, ctxt, cld->cld_logname,
&cld->cld_cfg);
EXIT;
out_pop:
llog_ctxt_put(ctxt);

3
drivers/staging/lustre/lustre/obdclass/acl.c
View File

@ -226,7 +226,6 @@ int lustre_posix_acl_xattr_filter(posix_acl_xattr_header *header, int size,
*out = new;
rc = 0;
}
EXIT;
_out:
if (rc) {
@ -394,7 +393,6 @@ int lustre_acl_xattr_merge2posix(posix_acl_xattr_header *posix_header, int size,
*out = new;
rc = 0;
}
EXIT;
_out:
if (rc) {
@ -528,7 +526,6 @@ lustre_acl_xattr_merge2ext(posix_acl_xattr_header *posix_header, int size,
new->a_count = cpu_to_le32(j);
/* free unused space. */
rc = lustre_ext_acl_xattr_reduce_space(&new, ext_count);
EXIT;
out:
if (rc) {

4
drivers/staging/lustre/lustre/obdclass/capa.c
View File

@ -311,8 +311,6 @@ int capa_encrypt_id(__u32 *d, __u32 *s, __u8 *key, int keylen)
GOTO(out, rc);
}
EXIT;
out:
ll_crypto_free_blkcipher(tfm);
return rc;
@ -364,8 +362,6 @@ int capa_decrypt_id(__u32 *d, __u32 *s, __u8 *key, int keylen)
GOTO(out, rc);
}
EXIT;
out:
ll_crypto_free_blkcipher(tfm);
return rc;

30
drivers/staging/lustre/lustre/obdclass/cl_io.c
View File

@ -143,7 +143,6 @@ void cl_io_fini(const struct lu_env *env, struct cl_io *io)
default:
LBUG();
}
EXIT;
}
EXPORT_SYMBOL(cl_io_fini);
@ -321,7 +320,6 @@ static void cl_io_locks_sort(struct cl_io *io)
prev = curr;
}
} while (!done);
EXIT;
}
/**
@ -411,7 +409,6 @@ static void cl_lock_link_fini(const struct lu_env *env, struct cl_io *io,
}
if (link->cill_fini != NULL)
link->cill_fini(env, link);
EXIT;
}
static int cl_lockset_lock(const struct lu_env *env, struct cl_io *io,
@ -515,7 +512,6 @@ void cl_io_unlock(const struct lu_env *env, struct cl_io *io)
}
io->ci_state = CIS_UNLOCKED;
LASSERT(!cl_env_info(env)->clt_counters[CNL_TOP].ctc_nr_locks_acquired);
EXIT;
}
EXPORT_SYMBOL(cl_io_unlock);
@ -568,7 +564,6 @@ void cl_io_iter_fini(const struct lu_env *env, struct cl_io *io)
scan->cis_iop->op[io->ci_type].cio_iter_fini(env, scan);
}
io->ci_state = CIS_IT_ENDED;
EXIT;
}
EXPORT_SYMBOL(cl_io_iter_fini);
@ -593,7 +588,6 @@ void cl_io_rw_advance(const struct lu_env *env, struct cl_io *io, size_t nob)
scan->cis_iop->op[io->ci_type].cio_advance(env, scan,
nob);
}
EXIT;
}
EXPORT_SYMBOL(cl_io_rw_advance);
@ -688,7 +682,6 @@ void cl_io_end(const struct lu_env *env, struct cl_io *io)
/* TODO: error handling. */
}
io->ci_state = CIS_IO_FINISHED;
EXIT;
}
EXPORT_SYMBOL(cl_io_end);
@ -1044,7 +1037,6 @@ void cl_io_slice_add(struct cl_io *io, struct cl_io_slice *slice,
slice->cis_io = io;
slice->cis_obj = obj;
slice->cis_iop = ops;
EXIT;
}
EXPORT_SYMBOL(cl_io_slice_add);
@ -1057,7 +1049,6 @@ void cl_page_list_init(struct cl_page_list *plist)
plist->pl_nr = 0;
INIT_LIST_HEAD(&plist->pl_pages);
plist->pl_owner = current;
EXIT;
}
EXPORT_SYMBOL(cl_page_list_init);
@ -1079,7 +1070,6 @@ void cl_page_list_add(struct cl_page_list *plist, struct cl_page *page)
++plist->pl_nr;
lu_ref_add_at(&page->cp_reference, &page->cp_queue_ref, "queue", plist);
cl_page_get(page);
EXIT;
}
EXPORT_SYMBOL(cl_page_list_add);
@ -1099,7 +1089,6 @@ void cl_page_list_del(const struct lu_env *env,
--plist->pl_nr;
lu_ref_del_at(&page->cp_reference, &page->cp_queue_ref, "queue", plist);
cl_page_put(env, page);
EXIT;
}
EXPORT_SYMBOL(cl_page_list_del);
@ -1118,7 +1107,6 @@ void cl_page_list_move(struct cl_page_list *dst, struct cl_page_list *src,
++dst->pl_nr;
lu_ref_set_at(&page->cp_reference, &page->cp_queue_ref, "queue",
src, dst);
EXIT;
}
EXPORT_SYMBOL(cl_page_list_move);
@ -1135,7 +1123,6 @@ void cl_page_list_splice(struct cl_page_list *list, struct cl_page_list *head)
cl_page_list_for_each_safe(page, tmp, list)
cl_page_list_move(head, list, page);
EXIT;
}
EXPORT_SYMBOL(cl_page_list_splice);
@ -1174,7 +1161,6 @@ void cl_page_list_disown(const struct lu_env *env,
plist);
cl_page_put(env, page);
}
EXIT;
}
EXPORT_SYMBOL(cl_page_list_disown);
@ -1191,7 +1177,6 @@ void cl_page_list_fini(const struct lu_env *env, struct cl_page_list *plist)
cl_page_list_for_each_safe(page, temp, plist)
cl_page_list_del(env, plist, page);
LASSERT(plist->pl_nr == 0);
EXIT;
}
EXPORT_SYMBOL(cl_page_list_fini);
@ -1247,7 +1232,6 @@ void cl_page_list_discard(const struct lu_env *env, struct cl_io *io,
LINVRNT(plist->pl_owner == current);
cl_page_list_for_each(page, plist)
cl_page_discard(env, io, page);
EXIT;
}
EXPORT_SYMBOL(cl_page_list_discard);
@ -1278,7 +1262,6 @@ void cl_2queue_init(struct cl_2queue *queue)
{
cl_page_list_init(&queue->c2_qin);
cl_page_list_init(&queue->c2_qout);
EXIT;
}
EXPORT_SYMBOL(cl_2queue_init);
@ -1288,7 +1271,6 @@ EXPORT_SYMBOL(cl_2queue_init);
void cl_2queue_add(struct cl_2queue *queue, struct cl_page *page)
{
cl_page_list_add(&queue->c2_qin, page);
EXIT;
}
EXPORT_SYMBOL(cl_2queue_add);
@ -1300,7 +1282,6 @@ void cl_2queue_disown(const struct lu_env *env,
{
cl_page_list_disown(env, io, &queue->c2_qin);
cl_page_list_disown(env, io, &queue->c2_qout);
EXIT;
}
EXPORT_SYMBOL(cl_2queue_disown);
@ -1312,7 +1293,6 @@ void cl_2queue_discard(const struct lu_env *env,
{
cl_page_list_discard(env, io, &queue->c2_qin);
cl_page_list_discard(env, io, &queue->c2_qout);
EXIT;
}
EXPORT_SYMBOL(cl_2queue_discard);
@ -1334,7 +1314,6 @@ void cl_2queue_fini(const struct lu_env *env, struct cl_2queue *queue)
{
cl_page_list_fini(env, &queue->c2_qout);
cl_page_list_fini(env, &queue->c2_qin);
EXIT;
}
EXPORT_SYMBOL(cl_2queue_fini);
@ -1345,7 +1324,6 @@ void cl_2queue_init_page(struct cl_2queue *queue, struct cl_page *page)
{
cl_2queue_init(queue);
cl_2queue_add(queue, page);
EXIT;
}
EXPORT_SYMBOL(cl_2queue_init_page);
@ -1387,7 +1365,6 @@ void cl_req_slice_add(struct cl_req *req, struct cl_req_slice *slice,
slice->crs_dev = dev;
slice->crs_ops = ops;
slice->crs_req = req;
EXIT;
}
EXPORT_SYMBOL(cl_req_slice_add);
@ -1413,7 +1390,6 @@ static void cl_req_free(const struct lu_env *env, struct cl_req *req)
OBD_FREE(req->crq_o, req->crq_nrobjs * sizeof req->crq_o[0]);
}
OBD_FREE_PTR(req);
EXIT;
}
static int cl_req_init(const struct lu_env *env, struct cl_req *req,
@ -1459,7 +1435,6 @@ void cl_req_completion(const struct lu_env *env, struct cl_req *req, int rc)
slice->crs_ops->cro_completion(env, slice, rc);
}
cl_req_free(env, req);
EXIT;
}
EXPORT_SYMBOL(cl_req_completion);
@ -1528,7 +1503,6 @@ void cl_req_page_add(const struct lu_env *env,
}
}
LASSERT(i < req->crq_nrobjs);
EXIT;
}
EXPORT_SYMBOL(cl_req_page_add);
@ -1547,7 +1521,6 @@ void cl_req_page_done(const struct lu_env *env, struct cl_page *page)
list_del_init(&page->cp_flight);
--req->crq_nrpages;
page->cp_req = NULL;
EXIT;
}
EXPORT_SYMBOL(cl_req_page_done);
@ -1611,7 +1584,6 @@ void cl_req_attr_set(const struct lu_env *env, struct cl_req *req,
attr + i, flags);
}
}
EXIT;
}
EXPORT_SYMBOL(cl_req_attr_set);
@ -1628,7 +1600,6 @@ void cl_sync_io_init(struct cl_sync_io *anchor, int nrpages)
atomic_set(&anchor->csi_sync_nr, nrpages);
atomic_set(&anchor->csi_barrier, nrpages > 0);
anchor->csi_sync_rc = 0;
EXIT;
}
EXPORT_SYMBOL(cl_sync_io_init);
@ -1694,6 +1665,5 @@ void cl_sync_io_note(struct cl_sync_io *anchor, int ioret)
/* it's safe to nuke or reuse anchor now */
atomic_set(&anchor->csi_barrier, 0);
}
EXIT;
}
EXPORT_SYMBOL(cl_sync_io_note);

21
drivers/staging/lustre/lustre/obdclass/cl_lock.c
View File

@ -195,7 +195,6 @@ void cl_lock_slice_add(struct cl_lock *lock, struct cl_lock_slice *slice,
list_add_tail(&slice->cls_linkage, &lock->cll_layers);
slice->cls_obj = obj;
slice->cls_ops = ops;
EXIT;
}
EXPORT_SYMBOL(cl_lock_slice_add);
@ -271,7 +270,6 @@ static void cl_lock_free(const struct lu_env *env, struct cl_lock *lock)
lu_ref_fini(&lock->cll_holders);
mutex_destroy(&lock->cll_guard);
OBD_SLAB_FREE_PTR(lock, cl_lock_kmem);
EXIT;
}
/**
@ -301,7 +299,6 @@ void cl_lock_put(const struct lu_env *env, struct cl_lock *lock)
}
CS_LOCK_DEC(obj, busy);
}
EXIT;
}
EXPORT_SYMBOL(cl_lock_put);
@ -783,7 +780,6 @@ static void cl_lock_cancel0(const struct lu_env *env, struct cl_lock *lock)
slice->cls_ops->clo_cancel(env, slice);
}
}
EXIT;
}
static void cl_lock_delete0(const struct lu_env *env, struct cl_lock *lock)
@ -823,7 +819,6 @@ static void cl_lock_delete0(const struct lu_env *env, struct cl_lock *lock)
* existing references goes away.
*/
}
EXIT;
}
/**
@ -896,7 +891,6 @@ void cl_lock_hold_release(const struct lu_env *env, struct cl_lock *lock,
cl_lock_delete0(env, lock);
}
}
EXIT;
}
EXPORT_SYMBOL(cl_lock_hold_release);
@ -977,7 +971,6 @@ static void cl_lock_state_signal(const struct lu_env *env, struct cl_lock *lock,
if (slice->cls_ops->clo_state != NULL)
slice->cls_ops->clo_state(env, slice, state);
wake_up_all(&lock->cll_wq);
EXIT;
}
/**
@ -991,7 +984,6 @@ void cl_lock_signal(const struct lu_env *env, struct cl_lock *lock)
{
cl_lock_trace(D_DLMTRACE, env, "state signal lock", lock);
cl_lock_state_signal(env, lock, lock->cll_state);
EXIT;
}
EXPORT_SYMBOL(cl_lock_signal);
@ -1023,7 +1015,6 @@ void cl_lock_state_set(const struct lu_env *env, struct cl_lock *lock,
cl_lock_state_signal(env, lock, state);
lock->cll_state = state;
}
EXIT;
}
EXPORT_SYMBOL(cl_lock_state_set);
@ -1388,8 +1379,6 @@ static void cl_unuse_locked(const struct lu_env *env, struct cl_lock *lock)
result = cl_unuse_try(env, lock);
if (result)
CL_LOCK_DEBUG(D_ERROR, env, lock, "unuse return %d\n", result);
EXIT;
}
/**
@ -1401,7 +1390,6 @@ void cl_unuse(const struct lu_env *env, struct cl_lock *lock)
cl_unuse_locked(env, lock);
cl_lock_mutex_put(env, lock);
cl_lock_lockdep_release(env, lock);
EXIT;
}
EXPORT_SYMBOL(cl_unuse);
@ -1737,7 +1725,6 @@ void cl_lock_delete(const struct lu_env *env, struct cl_lock *lock)
cl_lock_delete0(env, lock);
else
lock->cll_flags |= CLF_DOOMED;
EXIT;
}
EXPORT_SYMBOL(cl_lock_delete);
@ -1763,7 +1750,6 @@ void cl_lock_error(const struct lu_env *env, struct cl_lock *lock, int error)
cl_lock_cancel(env, lock);
cl_lock_delete(env, lock);
}
EXIT;
}
EXPORT_SYMBOL(cl_lock_error);
@ -1788,7 +1774,6 @@ void cl_lock_cancel(const struct lu_env *env, struct cl_lock *lock)
cl_lock_cancel0(env, lock);
else
lock->cll_flags |= CLF_CANCELPEND;
EXIT;
}
EXPORT_SYMBOL(cl_lock_cancel);
@ -2018,7 +2003,6 @@ void cl_locks_prune(const struct lu_env *env, struct cl_object *obj, int cancel)
spin_lock(&head->coh_lock_guard);
}
spin_unlock(&head->coh_lock_guard);
EXIT;
}
EXPORT_SYMBOL(cl_locks_prune);
@ -2128,7 +2112,6 @@ void cl_lock_hold_add(const struct lu_env *env, struct cl_lock *lock,
cl_lock_get(lock);
lu_ref_add(&lock->cll_holders, scope, source);
lu_ref_add(&lock->cll_reference, scope, source);
EXIT;
}
EXPORT_SYMBOL(cl_lock_hold_add);
@ -2143,7 +2126,6 @@ void cl_lock_unhold(const struct lu_env *env, struct cl_lock *lock,
cl_lock_hold_release(env, lock, scope, source);
lu_ref_del(&lock->cll_reference, scope, source);
cl_lock_put(env, lock);
EXIT;
}
EXPORT_SYMBOL(cl_lock_unhold);
@ -2160,7 +2142,6 @@ void cl_lock_release(const struct lu_env *env, struct cl_lock *lock,
cl_lock_mutex_put(env, lock);
lu_ref_del(&lock->cll_reference, scope, source);
cl_lock_put(env, lock);
EXIT;
}
EXPORT_SYMBOL(cl_lock_release);
@ -2170,7 +2151,6 @@ void cl_lock_user_add(const struct lu_env *env, struct cl_lock *lock)
LINVRNT(cl_lock_invariant(env, lock));
cl_lock_used_mod(env, lock, +1);
EXIT;
}
EXPORT_SYMBOL(cl_lock_user_add);
@ -2183,7 +2163,6 @@ void cl_lock_user_del(const struct lu_env *env, struct cl_lock *lock)
cl_lock_used_mod(env, lock, -1);
if (lock->cll_users == 0)
wake_up_all(&lock->cll_wq);
EXIT;
}
EXPORT_SYMBOL(cl_lock_user_del);

3
drivers/staging/lustre/lustre/obdclass/cl_object.c
View File

@ -359,7 +359,6 @@ void cl_object_prune(const struct lu_env *env, struct cl_object *obj)
{
cl_pages_prune(env, obj);
cl_locks_prune(env, obj, 1);
EXIT;
}
EXPORT_SYMBOL(cl_object_prune);
@ -940,7 +939,6 @@ void cl_attr2lvb(struct ost_lvb *lvb, const struct cl_attr *attr)
lvb->lvb_atime = attr->cat_atime;
lvb->lvb_ctime = attr->cat_ctime;
lvb->lvb_blocks = attr->cat_blocks;
EXIT;
}
EXPORT_SYMBOL(cl_attr2lvb);
@ -956,7 +954,6 @@ void cl_lvb2attr(struct cl_attr *attr, const struct ost_lvb *lvb)
attr->cat_atime = lvb->lvb_atime;
attr->cat_ctime = lvb->lvb_ctime;
attr->cat_blocks = lvb->lvb_blocks;
EXIT;
}
EXPORT_SYMBOL(cl_lvb2attr);

19
drivers/staging/lustre/lustre/obdclass/cl_page.c
View File

@ -271,7 +271,6 @@ static void cl_page_free(const struct lu_env *env, struct cl_page *page)
cl_object_put(env, obj);
lu_ref_fini(&page->cp_reference);
OBD_FREE(page, pagesize);
EXIT;
}
/**
@ -560,7 +559,6 @@ static void cl_page_state_set0(const struct lu_env *env,
CS_PAGESTATE_INC(page->cp_obj, state);
cl_page_state_set_trust(page, state);
}
EXIT;
}
static void cl_page_state_set(const struct lu_env *env,
@ -580,7 +578,6 @@ static void cl_page_state_set(const struct lu_env *env,
void cl_page_get(struct cl_page *page)
{
cl_page_get_trust(page);
EXIT;
}
EXPORT_SYMBOL(cl_page_get);
@ -612,8 +609,6 @@ void cl_page_put(const struct lu_env *env, struct cl_page *page)
*/
cl_page_free(env, page);
}
EXIT;
}
EXPORT_SYMBOL(cl_page_put);
@ -790,7 +785,6 @@ static void cl_page_invoid(const struct lu_env *env,
CL_PAGE_INVOID(env, page, op,
(const struct lu_env *,
const struct cl_page_slice *, struct cl_io *), io);
EXIT;
}
static void cl_page_owner_clear(struct cl_page *page)
@ -803,7 +797,6 @@ static void cl_page_owner_clear(struct cl_page *page)
page->cp_task = NULL;
}
}
EXIT;
}
static void cl_page_owner_set(struct cl_page *page)
@ -812,7 +805,6 @@ static void cl_page_owner_set(struct cl_page *page)
LASSERT(page->cp_owner != NULL);
page->cp_owner->ci_owned_nr++;
}
EXIT;
}
void cl_page_disown0(const struct lu_env *env,
@ -836,7 +828,6 @@ void cl_page_disown0(const struct lu_env *env,
(const struct lu_env *,
const struct cl_page_slice *, struct cl_io *),
io);
EXIT;
}
/**
@ -953,7 +944,6 @@ void cl_page_assume(const struct lu_env *env,
pg->cp_task = current;
cl_page_owner_set(pg);
cl_page_state_set(env, pg, CPS_OWNED);
EXIT;
}
EXPORT_SYMBOL(cl_page_assume);
@ -982,7 +972,6 @@ void cl_page_unassume(const struct lu_env *env,
(const struct lu_env *,
const struct cl_page_slice *, struct cl_io *),
io);
EXIT;
}
EXPORT_SYMBOL(cl_page_unassume);
@ -1005,7 +994,6 @@ void cl_page_disown(const struct lu_env *env,
pg = cl_page_top(pg);
io = cl_io_top(io);
cl_page_disown0(env, io, pg);
EXIT;
}
EXPORT_SYMBOL(cl_page_disown);
@ -1082,8 +1070,6 @@ static void cl_page_delete0(const struct lu_env *env, struct cl_page *pg,
cl_page_put(env, tmp);
}
}
EXIT;
}
/**
@ -1115,7 +1101,6 @@ void cl_page_delete(const struct lu_env *env, struct cl_page *pg)
{
PINVRNT(env, pg, cl_page_invariant(pg));
cl_page_delete0(env, pg, 1);
EXIT;
}
EXPORT_SYMBOL(cl_page_delete);
@ -1193,7 +1178,6 @@ static void cl_page_io_start(const struct lu_env *env,
*/
cl_page_owner_clear(pg);
cl_page_state_set(env, pg, cl_req_type_state(crt));
EXIT;
}
/**
@ -1282,8 +1266,6 @@ void cl_page_completion(const struct lu_env *env,
if (anchor)
cl_sync_io_note(anchor, ioret);
EXIT;
}
EXPORT_SYMBOL(cl_page_completion);
@ -1558,7 +1540,6 @@ void cl_page_slice_add(struct cl_page *page, struct cl_page_slice *slice,
slice->cpl_obj = obj;
slice->cpl_ops = ops;
slice->cpl_page = page;
EXIT;
}
EXPORT_SYMBOL(cl_page_slice_add);

2
drivers/staging/lustre/lustre/obdclass/class_obd.c
View File

@ -675,8 +675,6 @@ static void cleanup_obdclass(void)
CDEBUG((pages_leaked) ? D_ERROR : D_INFO,
"obd_memory_pages max: "LPU64", leaked: "LPU64"\n",
pages_max, pages_leaked);
EXIT;
}
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");

8
drivers/staging/lustre/lustre/obdclass/genops.c
View File

@ -648,7 +648,6 @@ void obd_cleanup_caches(void)
kmem_cache_destroy(capa_cachep);
capa_cachep = NULL;
}
EXIT;
}
int obd_init_caches(void)
@ -769,7 +768,6 @@ static void class_export_destroy(struct obd_export *exp)
class_decref(obd, "export", exp);
OBD_FREE_RCU(exp, sizeof(*exp), &exp->exp_handle);
EXIT;
}
static void export_handle_addref(void *export)
@ -947,7 +945,6 @@ void class_import_destroy(struct obd_import *imp)
LASSERT(imp->imp_sec == NULL);
class_decref(imp->imp_obd, "import", imp);
OBD_FREE_RCU(imp, sizeof(*imp), &imp->imp_handle);
EXIT;
}
static void import_handle_addref(void *import)
@ -986,7 +983,6 @@ void class_import_put(struct obd_import *imp)
/* catch possible import put race */
LASSERT_ATOMIC_GE_LT(&imp->imp_refcount, 0, LI_POISON);
EXIT;
}
EXPORT_SYMBOL(class_import_put);
@ -1265,7 +1261,6 @@ static void class_disconnect_export_list(struct list_head *list,
obd_export_nid2str(exp), exp, rc);
class_export_put(exp);
}
EXIT;
}
void class_disconnect_exports(struct obd_device *obd)
@ -1287,7 +1282,6 @@ void class_disconnect_exports(struct obd_device *obd)
} else
CDEBUG(D_HA, "OBD device %d (%p) has no exports\n",
obd->obd_minor, obd);
EXIT;
}
EXPORT_SYMBOL(class_disconnect_exports);
@ -1338,7 +1332,6 @@ void class_disconnect_stale_exports(struct obd_device *obd,
class_disconnect_export_list(&work_list, exp_flags_from_obd(obd) |
OBD_OPT_ABORT_RECOV);
EXIT;
}
EXPORT_SYMBOL(class_disconnect_stale_exports);
@ -1605,7 +1598,6 @@ void obd_zombie_impexp_cull(void)
cond_resched();
} while (import != NULL || export != NULL);
EXIT;
}
static struct completion obd_zombie_start;

1
drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
View File

@ -149,7 +149,6 @@ int obd_ioctl_getdata(char **buf, int *len, void *arg)
data->ioc_inlbuf4 = &data->ioc_bulk[0] + offset;
}
EXIT;
return 0;
}
EXPORT_SYMBOL(obd_ioctl_getdata);

1
drivers/staging/lustre/lustre/obdclass/llog_cat.c
View File

@ -202,7 +202,6 @@ int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
loghandle->u.phd.phd_cookie.lgc_lgl = cathandle->lgh_id;
loghandle->u.phd.phd_cookie.lgc_index =
loghandle->lgh_hdr->llh_cat_idx;
EXIT;
out:
llog_handle_get(loghandle);
*res = loghandle;

1
drivers/staging/lustre/lustre/obdclass/llog_osd.c
View File

@ -1221,7 +1221,6 @@ int llog_osd_get_cat_list(const struct lu_env *env, struct dt_device *d,
GOTO(out, rc);
}
EXIT;
out:
lu_object_put(env, &o->do_lu);
RETURN(rc);

6
drivers/staging/lustre/lustre/obdclass/llog_swab.c
View File

@ -97,7 +97,6 @@ void lustre_swab_llogd_body (struct llogd_body *d)
__swab32s (&d->lgd_len);
__swab64s (&d->lgd_cur_offset);
print_llogd_body(d);
EXIT;
}
EXPORT_SYMBOL(lustre_swab_llogd_body);
@ -302,7 +301,6 @@ void lustre_swab_llog_hdr (struct llog_log_hdr *h)
lustre_swab_llog_rec(&h->llh_hdr);
print_llog_hdr(h);
EXIT;
}
EXPORT_SYMBOL(lustre_swab_llog_hdr);
@ -325,7 +323,6 @@ static void print_lustre_cfg(struct lustre_cfg *lcfg)
for (i = 0; i < lcfg->lcfg_bufcount; i++)
CDEBUG(D_OTHER, "\tlcfg->lcfg_buflens[%d]: %d\n",
i, lcfg->lcfg_buflens[i]);
EXIT;
}
void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg)
@ -337,7 +334,6 @@ void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg)
if (lcfg->lcfg_version != LUSTRE_CFG_VERSION) {
CERROR("not swabbing lustre_cfg version %#x (expecting %#x)\n",
lcfg->lcfg_version, LUSTRE_CFG_VERSION);
EXIT;
return;
}
@ -350,7 +346,6 @@ void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg)
__swab32s(&lcfg->lcfg_buflens[i]);
print_lustre_cfg(lcfg);
EXIT;
return;
}
EXPORT_SYMBOL(lustre_swab_lustre_cfg);
@ -413,7 +408,6 @@ void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size)
__swab64s(&marker->cm_canceltime);
}
EXIT;
return;
}
EXPORT_SYMBOL(lustre_swab_cfg_marker);

1
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
View File

@ -910,7 +910,6 @@ void lprocfs_free_per_client_stats(struct obd_device *obd)
cfs_hash_del(hash, &stat->nid, &stat->nid_hash);
lprocfs_free_client_stats(stat);
}
EXIT;
}
EXPORT_SYMBOL(lprocfs_free_per_client_stats);

3
drivers/staging/lustre/lustre/obdclass/lustre_handles.c
View File

@ -99,7 +99,6 @@ void class_handle_hash(struct portals_handle *h,
CDEBUG(D_INFO, "added object %p with handle "LPX64" to hash\n",
h, h->h_cookie);
EXIT;
}
EXPORT_SYMBOL(class_handle_hash);
@ -145,8 +144,6 @@ void class_handle_hash_back(struct portals_handle *h)
list_add_rcu(&h->h_link, &bucket->head);
h->h_in = 1;
spin_unlock(&bucket->lock);
EXIT;
}
EXPORT_SYMBOL(class_handle_hash_back);

2
drivers/staging/lustre/lustre/obdclass/obd_config.c
View File

@ -902,7 +902,6 @@ void class_del_profile(const char *prof)
OBD_FREE(lprof->lp_md, strlen(lprof->lp_md) + 1);
OBD_FREE(lprof, sizeof *lprof);
}
EXIT;
}
EXPORT_SYMBOL(class_del_profile);
@ -919,7 +918,6 @@ void class_del_profiles(void)
OBD_FREE(lprof->lp_md, strlen(lprof->lp_md) + 1);
OBD_FREE(lprof, sizeof *lprof);
}
EXIT;
}
EXPORT_SYMBOL(class_del_profiles);

7
drivers/staging/lustre/lustre/obdecho/echo_client.c
View File

@ -316,7 +316,6 @@ static void echo_page_fini(const struct lu_env *env,
atomic_dec(&eco->eo_npages);
page_cache_release(vmpage);
EXIT;
}
static int echo_page_prep(const struct lu_env *env,
@ -565,7 +564,6 @@ static void echo_object_free(const struct lu_env *env, struct lu_object *obj)
if (eco->eo_lsm)
echo_free_memmd(eco->eo_dev, &eco->eo_lsm);
OBD_SLAB_FREE_PTR(eco, echo_object_kmem);
EXIT;
}
static int echo_object_print(const struct lu_env *env, void *cookie,
@ -1214,7 +1212,6 @@ static int cl_echo_enqueue(struct echo_object *eco, obd_off start, obd_off end,
result = cl_echo_enqueue0(env, eco, start, end, mode, cookie, 0);
cl_io_fini(env, io);
EXIT;
out:
cl_env_put(env, &refcheck);
return result;
@ -1366,7 +1363,6 @@ static int cl_echo_object_brw(struct echo_object *eco, int rw, obd_off offset,
}
cl_echo_cancel0(env, ed, lh.cookie);
EXIT;
error_lock:
cl_2queue_discard(env, io, queue);
cl_2queue_disown(env, io, queue);
@ -1597,7 +1593,6 @@ echo_md_create_internal(const struct lu_env *env, struct echo_device *ed,
}
CDEBUG(D_RPCTRACE, "End creating object "DFID" %s %p rc = %d\n",
PFID(lu_object_fid(&parent->mo_lu)), lname->ln_name, parent, rc);
EXIT;
out_put:
lu_object_put(env, ec_child);
return rc;
@ -2280,7 +2275,6 @@ static int echo_create_object(const struct lu_env *env, struct echo_device *ed,
cl_echo_object_put(eco);
CDEBUG(D_INFO, "oa oid "DOSTID"\n", POSTID(&oa->o_oi));
EXIT;
failed:
if (created && rc)
@ -2938,7 +2932,6 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
GOTO (out, rc = -ENOTTY);
}
EXIT;
out:
lu_env_fini(env);
OBD_FREE_PTR(env);

10
drivers/staging/lustre/lustre/osc/osc_cache.c
View File

@ -781,7 +781,6 @@ struct osc_extent *osc_extent_find(const struct lu_env *env,
goto restart;
}
EXIT;
out:
osc_extent_put(env, cur);
@ -1136,7 +1135,6 @@ static int osc_extent_expand(struct osc_extent *ext, pgoff_t index, int *grants)
LASSERT(*grants >= 0);
EASSERTF(osc_extent_is_overlapped(obj, ext) == 0, ext,
"overlapped after expanding for %lu.\n", index);
EXIT;
out:
osc_object_unlock(obj);
@ -1330,7 +1328,6 @@ static void osc_release_write_grant(struct client_obd *cli,
{
LASSERT(spin_is_locked(&cli->cl_loi_list_lock.lock));
if (!(pga->flag & OBD_BRW_FROM_GRANT)) {
EXIT;
return;
}
@ -1342,7 +1339,6 @@ static void osc_release_write_grant(struct client_obd *cli,
atomic_dec(&obd_dirty_transit_pages);
cli->cl_dirty_transit -= PAGE_CACHE_SIZE;
}
EXIT;
}
/**
@ -1544,7 +1540,6 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,
if (osc_enter_cache_try(cli, oap, bytes, 0))
GOTO(out, rc = 0);
}
EXIT;
out:
client_obd_list_unlock(&cli->cl_loi_list_lock);
OSC_DUMP_GRANT(cli, "returned %d.\n", rc);
@ -1582,8 +1577,6 @@ void osc_wake_cache_waiters(struct client_obd *cli)
wake_up(&ocw->ocw_waitq);
}
EXIT;
}
static int osc_max_rpc_in_flight(struct client_obd *cli, struct osc_object *osc)
@ -1765,8 +1758,6 @@ static void osc_ap_completion(const struct lu_env *env, struct client_obd *cli,
if (rc)
CERROR("completion on oap %p obj %p returns %d.\n",
oap, osc, rc);
EXIT;
}
/**
@ -2430,7 +2421,6 @@ int osc_flush_async_page(const struct lu_env *env, struct cl_io *io,
unplug = true;
}
rc = 0;
EXIT;
out:
osc_object_unlock(obj);

3
drivers/staging/lustre/lustre/osc/osc_lock.c
View File

@ -390,8 +390,6 @@ static void osc_lock_lvb_update(const struct lu_env *env, struct osc_lock *olck,
cl_object_attr_set(env, obj, attr, valid);
cl_object_attr_unlock(obj);
EXIT;
}
/**
@ -439,7 +437,6 @@ static void osc_lock_granted(const struct lu_env *env, struct osc_lock *olck,
LINVRNT(osc_lock_invariant(olck));
lock_res_and_lock(dlmlock);
}
EXIT;
}
static void osc_lock_upcall0(const struct lu_env *env, struct osc_lock *olck)

1
drivers/staging/lustre/lustre/osc/osc_page.c
View File

@ -437,7 +437,6 @@ static void osc_page_delete(const struct lu_env *env,
spin_unlock(&obj->oo_seatbelt);
osc_lru_del(osc_cli(obj), opg, true);
EXIT;
}
void osc_page_clip(const struct lu_env *env, const struct cl_page_slice *slice,

4
drivers/staging/lustre/lustre/osc/osc_request.c
View File

@ -291,7 +291,6 @@ static int osc_getattr(const struct lu_env *env, struct obd_export *exp,
oinfo->oi_oa->o_blksize = cli_brw_size(exp->exp_obd);
oinfo->oi_oa->o_valid |= OBD_MD_FLBLKSZ;
EXIT;
out:
ptlrpc_req_finished(req);
return rc;
@ -332,7 +331,6 @@ static int osc_setattr(const struct lu_env *env, struct obd_export *exp,
lustre_get_wire_obdo(&req->rq_import->imp_connect_data, oinfo->oi_oa,
&body->oa);
EXIT;
out:
ptlrpc_req_finished(req);
RETURN(rc);
@ -2202,7 +2200,6 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
*/
ptlrpcd_add_req(req, pol, -1);
rc = 0;
EXIT;
out:
if (mem_tight != 0)
@ -2822,7 +2819,6 @@ static int osc_statfs(const struct lu_env *env, struct obd_export *exp,
*osfs = *msfs;
EXIT;
out:
ptlrpc_req_finished(req);
return rc;

14
drivers/staging/lustre/lustre/ptlrpc/client.c
View File

@ -206,7 +206,6 @@ void __ptlrpc_free_bulk(struct ptlrpc_bulk_desc *desc, int unpin)
OBD_FREE(desc, offsetof(struct ptlrpc_bulk_desc,
bd_iov[desc->bd_max_iov]));
EXIT;
}
EXPORT_SYMBOL(__ptlrpc_free_bulk);
@ -919,7 +918,6 @@ void ptlrpc_set_destroy(struct ptlrpc_request_set *set)
LASSERT(atomic_read(&set->set_remaining) == 0);
ptlrpc_reqset_put(set);
EXIT;
}
EXPORT_SYMBOL(ptlrpc_set_destroy);
@ -1156,8 +1154,6 @@ static void ptlrpc_save_versions(struct ptlrpc_request *req)
lustre_msg_set_versions(reqmsg, versions);
CDEBUG(D_INFO, "Client save versions ["LPX64"/"LPX64"]\n",
versions[0], versions[1]);
EXIT;
}
/**
@ -2169,7 +2165,6 @@ EXPORT_SYMBOL(ptlrpc_set_wait);
static void __ptlrpc_free_req(struct ptlrpc_request *request, int locked)
{
if (request == NULL) {
EXIT;
return;
}
@ -2222,7 +2217,6 @@ static void __ptlrpc_free_req(struct ptlrpc_request *request, int locked)
__ptlrpc_free_req_to_pool(request);
else
OBD_FREE(request, sizeof(*request));
EXIT;
}
static int __ptlrpc_req_finished(struct ptlrpc_request *request, int locked);
@ -2388,7 +2382,6 @@ void ptlrpc_free_committed(struct obd_import *imp)
imp->imp_generation == imp->imp_last_generation_checked) {
CDEBUG(D_INFO, "%s: skip recheck: last_committed "LPU64"\n",
imp->imp_obd->obd_name, imp->imp_peer_committed_transno);
EXIT;
return;
}
CDEBUG(D_RPCTRACE, "%s: committing for last_committed "LPU64" gen %d\n",
@ -2436,15 +2429,10 @@ void ptlrpc_free_committed(struct obd_import *imp)
list_del_init(&req->rq_replay_list);
__ptlrpc_req_finished(req, 1);
}
EXIT;
return;
}
void ptlrpc_cleanup_client(struct obd_import *imp)
{
EXIT;
return;
}
EXPORT_SYMBOL(ptlrpc_cleanup_client);
@ -2783,8 +2771,6 @@ void ptlrpc_abort_inflight(struct obd_import *imp)
ptlrpc_free_committed(imp);
spin_unlock(&imp->imp_lock);
EXIT;
}
EXPORT_SYMBOL(ptlrpc_abort_inflight);

5
drivers/staging/lustre/lustre/ptlrpc/connection.c
View File

@ -79,7 +79,6 @@ ptlrpc_connection_get(lnet_process_id_t peer, lnet_nid_t self,
OBD_FREE_PTR(conn);
conn = conn2;
}
EXIT;
out:
CDEBUG(D_INFO, "conn=%p refcount %d to %s\n",
conn, atomic_read(&conn->c_refcount),
@ -152,9 +151,9 @@ int ptlrpc_connection_init(void)
}
EXPORT_SYMBOL(ptlrpc_connection_init);
void ptlrpc_connection_fini(void) {
void ptlrpc_connection_fini(void)
{
cfs_hash_putref(conn_hash);
EXIT;
}
EXPORT_SYMBOL(ptlrpc_connection_fini);

7
drivers/staging/lustre/lustre/ptlrpc/events.c
View File

@ -78,8 +78,6 @@ void request_out_callback(lnet_event_t *ev)
}
ptlrpc_req_finished(req);
EXIT;
}
/*
@ -164,7 +162,6 @@ void reply_in_callback(lnet_event_t *ev)
* since we don't have our own ref */
ptlrpc_client_wake_req(req);
spin_unlock(&req->rq_lock);
EXIT;
}
/*
@ -217,7 +214,6 @@ void client_bulk_callback (lnet_event_t *ev)
ptlrpc_client_wake_req(desc->bd_req);
spin_unlock(&desc->bd_lock);
EXIT;
}
/*
@ -374,7 +370,6 @@ void request_in_callback(lnet_event_t *ev)
wake_up(&svcpt->scp_waitq);
spin_unlock(&svcpt->scp_lock);
EXIT;
}
/*
@ -395,7 +390,6 @@ void reply_out_callback(lnet_event_t *ev)
* net's ref on 'rs' */
LASSERT (ev->unlinked);
ptlrpc_rs_decref(rs);
EXIT;
return;
}
@ -416,7 +410,6 @@ void reply_out_callback(lnet_event_t *ev)
spin_unlock(&rs->rs_lock);
spin_unlock(&svcpt->scp_rep_lock);
}
EXIT;
}

4
drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c
View File

@ -926,7 +926,6 @@ void flush_spec_ctx_cache_kr(struct ptlrpc_sec *sec,
spin_unlock(&sec->ps_lock);
dispose_ctx_list_kr(&freelist);
EXIT;
}
static
@ -974,8 +973,6 @@ void gss_sec_gc_ctx_kr(struct ptlrpc_sec *sec)
spin_unlock(&sec->ps_lock);
dispose_ctx_list_kr(&freelist);
EXIT;
return;
}
static
@ -1308,7 +1305,6 @@ void gss_kt_destroy(struct key *key)
{
LASSERT(key->payload.data == NULL);
CDEBUG(D_SEC, "destroy key %p\n", key);
EXIT;
}
static

7
drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c
View File

@ -286,7 +286,6 @@ void gss_sec_ctx_replace_pf(struct gss_sec *gsec,
spin_unlock(&gsec->gs_base.ps_lock);
ctx_list_destroy_pf(&freelist);
EXIT;
}
static
@ -334,7 +333,6 @@ void gss_ctx_cache_gc_pf(struct gss_sec_pipefs *gsec_pf,
}
sec->ps_gc_next = cfs_time_current_sec() + sec->ps_gc_interval;
EXIT;
}
static
@ -701,7 +699,6 @@ void gss_release_msg(struct gss_upcall_msg *gmsg)
LASSERT(atomic_read(&gmsg->gum_refcount) > 0);
if (!atomic_dec_and_test(&gmsg->gum_refcount)) {
EXIT;
return;
}
@ -714,7 +711,6 @@ void gss_release_msg(struct gss_upcall_msg *gmsg)
LASSERT(list_empty(&gmsg->gum_list));
LASSERT(list_empty(&gmsg->gum_base.list));
OBD_FREE_PTR(gmsg);
EXIT;
}
static
@ -945,7 +941,6 @@ void gss_pipe_destroy_msg(struct rpc_pipe_msg *msg)
/* normally errno is >= 0 */
if (msg->errno >= 0) {
EXIT;
return;
}
@ -970,7 +965,6 @@ void gss_pipe_destroy_msg(struct rpc_pipe_msg *msg)
}
gss_msg_fail_ctx(gmsg);
gss_release_msg(gmsg);
EXIT;
}
static
@ -1009,7 +1003,6 @@ void gss_pipe_release(struct inode *inode)
upcall_list_lock(idx);
}
upcall_list_unlock(idx);
EXIT;
}
static struct rpc_pipe_ops gss_upcall_ops = {

1
drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c
View File

@ -681,7 +681,6 @@ static void rsc_flush(rsc_entry_match *match, long data)
}
}
write_unlock(&rsc_cache.hash_lock);
EXIT;
}
static int match_uid(struct rsc *rscp, long uid)

7
drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c
View File

@ -1157,8 +1157,6 @@ void gss_sec_destroy_common(struct gss_sec *gsec)
if (SPTLRPC_FLVR_BULK_SVC(sec->ps_flvr.sf_rpc) == SPTLRPC_BULK_SVC_PRIV)
sptlrpc_enc_pool_del_user();
EXIT;
}
void gss_sec_kill(struct ptlrpc_sec *sec)
@ -1462,8 +1460,6 @@ void gss_free_reqbuf(struct ptlrpc_sec *sec,
req->rq_reqbuf = NULL;
req->rq_reqbuf_len = 0;
}
EXIT;
}
static int do_alloc_repbuf(struct ptlrpc_request *req, int bufsize)
@ -2418,7 +2414,6 @@ void gss_svc_invalidate_ctx(struct ptlrpc_svc_ctx *svc_ctx)
struct gss_svc_reqctx *grctx;
if (svc_ctx == NULL) {
EXIT;
return;
}
@ -2427,8 +2422,6 @@ void gss_svc_invalidate_ctx(struct ptlrpc_svc_ctx *svc_ctx)
CWARN("gss svc invalidate ctx %p(%u)\n",
grctx->src_ctx, grctx->src_ctx->gsc_uid);
gss_svc_upcall_destroy_ctx(grctx->src_ctx);
EXIT;
}
static inline

5
drivers/staging/lustre/lustre/ptlrpc/import.c
View File

@ -204,8 +204,6 @@ static void ptlrpc_deactivate_and_unlock_import(struct obd_import *imp)
ptlrpc_abort_inflight(imp);
obd_import_event(imp->imp_obd, imp, IMP_EVENT_INACTIVE);
EXIT;
}
/*
@ -414,7 +412,6 @@ void ptlrpc_fail_import(struct obd_import *imp, __u32 conn_cnt)
ptlrpc_pinger_wake_up();
}
EXIT;
}
EXPORT_SYMBOL(ptlrpc_fail_import);
@ -1475,8 +1472,6 @@ void ptlrpc_cleanup_imp(struct obd_import *imp)
imp->imp_generation++;
spin_unlock(&imp->imp_lock);
ptlrpc_abort_inflight(imp);
EXIT;
}
EXPORT_SYMBOL(ptlrpc_cleanup_imp);

4
drivers/staging/lustre/lustre/ptlrpc/llog_client.c
View File

@ -132,7 +132,6 @@ static int llog_client_open(const struct lu_env *env,
lgh->lgh_id = body->lgd_logid;
lgh->lgh_ctxt = ctxt;
EXIT;
out:
LLOG_CLIENT_EXIT(ctxt, imp);
ptlrpc_req_finished(req);
@ -218,7 +217,6 @@ static int llog_client_next_block(const struct lu_env *env,
*cur_offset = body->lgd_cur_offset;
memcpy(buf, ptr, len);
EXIT;
out:
ptlrpc_req_finished(req);
err_exit:
@ -266,7 +264,6 @@ static int llog_client_prev_block(const struct lu_env *env,
GOTO(out, rc =-EFAULT);
memcpy(buf, ptr, len);
EXIT;
out:
ptlrpc_req_finished(req);
err_exit:
@ -321,7 +318,6 @@ static int llog_client_read_header(const struct lu_env *env,
CERROR("you may need to re-run lconf --write_conf.\n");
rc = -EIO;
}
EXIT;
out:
ptlrpc_req_finished(req);
err_exit:

4
drivers/staging/lustre/lustre/ptlrpc/llog_server.c
View File

@ -106,7 +106,6 @@ int llog_origin_handle_open(struct ptlrpc_request *req)
body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
body->lgd_logid = loghandle->lgh_id;
EXIT;
out_close:
llog_origin_close(req->rq_svc_thread->t_env, loghandle);
out_pop:
@ -202,7 +201,6 @@ int llog_origin_handle_next_block(struct ptlrpc_request *req)
&repbody->lgd_cur_offset, ptr, LLOG_CHUNK_SIZE);
if (rc)
GOTO(out_close, rc);
EXIT;
out_close:
llog_origin_close(req->rq_svc_thread->t_env, loghandle);
out_pop:
@ -261,7 +259,6 @@ int llog_origin_handle_prev_block(struct ptlrpc_request *req)
if (rc)
GOTO(out_close, rc);
EXIT;
out_close:
llog_origin_close(req->rq_svc_thread->t_env, loghandle);
out_pop:
@ -314,7 +311,6 @@ int llog_origin_handle_read_header(struct ptlrpc_request *req)
hdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR);
*hdr = *loghandle->lgh_hdr;
EXIT;
out_close:
llog_origin_close(req->rq_svc_thread->t_env, loghandle);
out_pop:

8
drivers/staging/lustre/lustre/ptlrpc/nrs.c
View File

@ -110,8 +110,6 @@ static void nrs_policy_stop0(struct ptlrpc_nrs_policy *policy)
if (atomic_dec_and_test(&policy->pol_desc->pd_refs))
module_put(policy->pol_desc->pd_owner);
EXIT;
}
static int nrs_policy_stop_locked(struct ptlrpc_nrs_policy *policy)
@ -158,7 +156,6 @@ static void nrs_policy_stop_primary(struct ptlrpc_nrs *nrs)
struct ptlrpc_nrs_policy *tmp = nrs->nrs_policy_primary;
if (tmp == NULL) {
EXIT;
return;
}
@ -169,7 +166,6 @@ static void nrs_policy_stop_primary(struct ptlrpc_nrs *nrs)
if (tmp->pol_ref == 0)
nrs_policy_stop0(tmp);
EXIT;
}
/**
@ -839,7 +835,6 @@ static void ptlrpc_nrs_hpreq_add_nolock(struct ptlrpc_request *req)
if (opc != OBD_PING)
DEBUG_REQ(D_NET, req, "high priority req");
spin_unlock(&req->rq_lock);
EXIT;
}
/**
@ -1020,8 +1015,6 @@ static void nrs_svcpt_cleanup_locked(struct ptlrpc_service_part *svcpt)
if (hp)
OBD_FREE_PTR(nrs);
EXIT;
}
/**
@ -1639,7 +1632,6 @@ void ptlrpc_nrs_req_hp_move(struct ptlrpc_request *req)
* returned false.
*/
nrs_resource_put_safe(res1);
EXIT;
}
/**

5
drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
View File

@ -2170,14 +2170,12 @@ static void lustre_swab_lov_user_md_common(struct lov_user_md_v1 *lum)
__swab16s(&lum->lmm_stripe_count);
__swab16s(&lum->lmm_stripe_offset);
print_lum(lum);
EXIT;
}
void lustre_swab_lov_user_md_v1(struct lov_user_md_v1 *lum)
{
CDEBUG(D_IOCTL, "swabbing lov_user_md v1\n");
lustre_swab_lov_user_md_common(lum);
EXIT;
}
EXPORT_SYMBOL(lustre_swab_lov_user_md_v1);
@ -2186,7 +2184,6 @@ void lustre_swab_lov_user_md_v3(struct lov_user_md_v3 *lum)
CDEBUG(D_IOCTL, "swabbing lov_user_md v3\n");
lustre_swab_lov_user_md_common((struct lov_user_md_v1 *)lum);
/* lmm_pool_name nothing to do with char */
EXIT;
}
EXPORT_SYMBOL(lustre_swab_lov_user_md_v3);
@ -2199,7 +2196,6 @@ void lustre_swab_lov_mds_md(struct lov_mds_md *lmm)
__swab32s(&lmm->lmm_stripe_size);
__swab16s(&lmm->lmm_stripe_count);
__swab16s(&lmm->lmm_layout_gen);
EXIT;
}
EXPORT_SYMBOL(lustre_swab_lov_mds_md);
@ -2213,7 +2209,6 @@ void lustre_swab_lov_user_md_objects(struct lov_user_ost_data *lod,
__swab32s(&(lod[i].l_ost_gen));
__swab32s(&(lod[i].l_ost_idx));
}
EXIT;
}
EXPORT_SYMBOL(lustre_swab_lov_user_md_objects);

1
drivers/staging/lustre/lustre/ptlrpc/pinger.c
View File

@ -350,7 +350,6 @@ static int ptlrpc_pinger_main(void *arg)
thread_is_event(thread),
&lwi);
if (thread_test_and_clear_flags(thread, SVC_STOPPING)) {
EXIT;
break;
} else {
/* woken after adding import to reset timer */

8
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
View File

@ -666,16 +666,13 @@ void ptlrpcd_stop(struct ptlrpcd_ctl *pc, int force)
{
if (!test_bit(LIOD_START, &pc->pc_flags)) {
CWARN("Thread for pc %p was not started\n", pc);
goto out;
return;
}
set_bit(LIOD_STOP, &pc->pc_flags);
if (force)
set_bit(LIOD_FORCE, &pc->pc_flags);
wake_up(&pc->pc_set->set_waitq);
out:
EXIT;
}
void ptlrpcd_free(struct ptlrpcd_ctl *pc)
@ -709,7 +706,6 @@ void ptlrpcd_free(struct ptlrpcd_ctl *pc)
pc->pc_partners = NULL;
}
pc->pc_npartners = 0;
EXIT;
}
static void ptlrpcd_fini(void)
@ -726,8 +722,6 @@ static void ptlrpcd_fini(void)
OBD_FREE(ptlrpcds, ptlrpcds->pd_size);
ptlrpcds = NULL;
}
EXIT;
}
static int ptlrpcd_init(void)

5
drivers/staging/lustre/lustre/ptlrpc/recover.c
View File

@ -62,8 +62,6 @@ void ptlrpc_initiate_recovery(struct obd_import *imp)
{
CDEBUG(D_HA, "%s: starting recovery\n", obd2cli_tgt(imp->imp_obd));
ptlrpc_connect_import(imp);
EXIT;
}
/**
@ -224,8 +222,6 @@ void ptlrpc_request_handle_notconn(struct ptlrpc_request *failed_req)
if (!failed_req->rq_no_resend)
failed_req->rq_resend = 1;
spin_unlock(&failed_req->rq_lock);
EXIT;
}
/**
@ -329,7 +325,6 @@ int ptlrpc_recover_import(struct obd_import *imp, char *new_uuid, int async)
CDEBUG(D_HA, "%s: recovery finished\n",
obd2cli_tgt(imp->imp_obd));
}
EXIT;
out:
return rc;

3
drivers/staging/lustre/lustre/ptlrpc/sec.c
View File

@ -441,7 +441,6 @@ void sptlrpc_req_put_ctx(struct ptlrpc_request *req, int sync)
sptlrpc_cli_ctx_put(req->rq_cli_ctx, sync);
req->rq_cli_ctx = NULL;
EXIT;
}
static
@ -1691,7 +1690,6 @@ void sptlrpc_cli_free_repbuf(struct ptlrpc_request *req)
policy = ctx->cc_sec->ps_policy;
policy->sp_cops->free_repbuf(ctx->cc_sec, req);
req->rq_repmsg = NULL;
EXIT;
}
int sptlrpc_cli_install_rvs_ctx(struct obd_import *imp,
@ -2149,7 +2147,6 @@ void sptlrpc_svc_free_rs(struct ptlrpc_reply_state *rs)
if (prealloc)
lustre_put_emerg_rs(rs);
EXIT;
}
void sptlrpc_svc_ctx_addref(struct ptlrpc_request *req)

1
drivers/staging/lustre/lustre/ptlrpc/sec_config.c
View File

@ -922,7 +922,6 @@ void sptlrpc_conf_client_adapt(struct obd_device *obd)
}
up_read(&obd->u.cli.cl_sem);
EXIT;
}
EXPORT_SYMBOL(sptlrpc_conf_client_adapt);

4
drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
View File

@ -425,7 +425,6 @@ void plain_destroy_sec(struct ptlrpc_sec *sec)
class_import_put(sec->ps_import);
OBD_FREE_PTR(plsec);
EXIT;
}
static
@ -590,7 +589,6 @@ void plain_free_reqbuf(struct ptlrpc_sec *sec,
req->rq_reqbuf = NULL;
req->rq_reqbuf_len = 0;
}
EXIT;
}
static
@ -631,7 +629,6 @@ void plain_free_repbuf(struct ptlrpc_sec *sec,
OBD_FREE_LARGE(req->rq_repbuf, req->rq_repbuf_len);
req->rq_repbuf = NULL;
req->rq_repbuf_len = 0;
EXIT;
}
static
@ -819,7 +816,6 @@ void plain_free_rs(struct ptlrpc_reply_state *rs)
if (!rs->rs_prealloc)
OBD_FREE_LARGE(rs, rs->rs_size);
EXIT;
}
static

11
drivers/staging/lustre/lustre/ptlrpc/service.c
View File

@ -379,7 +379,6 @@ void ptlrpc_dispatch_difficult_reply(struct ptlrpc_reply_state *rs)
spin_unlock(&hrt->hrt_lock);
wake_up(&hrt->hrt_waitq);
EXIT;
}
void
@ -391,14 +390,12 @@ ptlrpc_schedule_difficult_reply(struct ptlrpc_reply_state *rs)
rs->rs_scheduled_ever = 1; /* flag any notification attempt */
if (rs->rs_scheduled) { /* being set up or already notified */
EXIT;
return;
}
rs->rs_scheduled = 1;
list_del_init(&rs->rs_list);
ptlrpc_dispatch_difficult_reply(rs);
EXIT;
}
EXPORT_SYMBOL(ptlrpc_schedule_difficult_reply);
@ -425,7 +422,6 @@ void ptlrpc_commit_replies(struct obd_export *exp)
}
spin_unlock(&exp->exp_uncommitted_replies_lock);
rs_batch_fini(&batch);
EXIT;
}
EXPORT_SYMBOL(ptlrpc_commit_replies);
@ -1071,7 +1067,6 @@ static void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay)
if (exp->exp_obd->obd_recovering) {
/* be nice to everyone during recovery */
EXIT;
return;
}
@ -1100,8 +1095,6 @@ static void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay)
exp->exp_obd->obd_eviction_timer = 0;
}
}
EXIT;
}
/**
@ -1547,7 +1540,6 @@ static void ptlrpc_server_hpreq_fini(struct ptlrpc_request *req)
list_del_init(&req->rq_exp_list);
spin_unlock_bh(&req->rq_export->exp_rpc_lock);
}
EXIT;
}
static int ptlrpc_hpreq_check(struct ptlrpc_request *req)
@ -2615,7 +2607,6 @@ static void ptlrpc_svcpt_stop_threads(struct ptlrpc_service_part *svcpt)
list_del(&thread->t_link);
OBD_FREE_PTR(thread);
}
EXIT;
}
/**
@ -2630,8 +2621,6 @@ void ptlrpc_stop_all_threads(struct ptlrpc_service *svc)
if (svcpt->scp_service != NULL)
ptlrpc_svcpt_stop_threads(svcpt);
}
EXIT;
}
EXPORT_SYMBOL(ptlrpc_stop_all_threads);