@@ -589,12 +589,6 @@ struct ldlm_lock {
* Must be first in the structure.
*/
struct portals_handle l_handle;
- /**
- * Lock reference count.
- * This is how many users have pointers to actual structure, so that
- * we do not accidentally free lock structure that is in use.
- */
- atomic_t l_refc;
/**
* Internal spinlock protects l_resource. We should hold this lock
* first before taking res_lock.
@@ -67,7 +67,6 @@ struct obd_export {
* what export they are talking to.
*/
struct portals_handle exp_handle;
- refcount_t exp_refcount;
/**
* Set of counters below is to track where export references are
* kept. The exp_rpc_count is used for reconnect handling also,
@@ -46,7 +46,6 @@
#include <linux/types.h>
struct portals_handle_ops {
- void (*hop_addref)(void *object);
void (*hop_free)(void *object, int size);
};
@@ -66,6 +65,7 @@ struct portals_handle {
struct list_head h_link;
u64 h_cookie;
const struct portals_handle_ops *h_ops;
+ refcount_t h_ref;
/* newly added fields to handle the RCU issue. -jxiong */
struct rcu_head h_rcu;
@@ -154,8 +154,6 @@ struct import_state_hist {
struct obd_import {
/** Local handle (== id) for this import. */
struct portals_handle imp_handle;
- /** Reference counter */
- atomic_t imp_refcount;
struct lustre_handle imp_dlm_handle; /* client's ldlm export */
/** Currently active connection */
struct ptlrpc_connection *imp_connection;
@@ -148,7 +148,7 @@ EXPORT_SYMBOL(ldlm_it2str);
*/
struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock)
{
- atomic_inc(&lock->l_refc);
+ refcount_inc(&lock->l_handle.h_ref);
return lock;
}
EXPORT_SYMBOL(ldlm_lock_get);
@@ -161,8 +161,8 @@ EXPORT_SYMBOL(ldlm_lock_get);
void ldlm_lock_put(struct ldlm_lock *lock)
{
LASSERT(lock->l_resource != LP_POISON);
- LASSERT(atomic_read(&lock->l_refc) > 0);
- if (atomic_dec_and_test(&lock->l_refc)) {
+ LASSERT(refcount_read(&lock->l_handle.h_ref) > 0);
+ if (refcount_dec_and_test(&lock->l_handle.h_ref)) {
struct ldlm_resource *res;
LDLM_DEBUG(lock,
@@ -349,12 +349,6 @@ void ldlm_lock_destroy_nolock(struct ldlm_lock *lock)
LDLM_LOCK_RELEASE(lock);
}
-/* this is called by portals_handle2object with the handle lock taken */
-static void lock_handle_addref(void *lock)
-{
- LDLM_LOCK_GET((struct ldlm_lock *)lock);
-}
-
static void lock_handle_free(void *lock, int size)
{
LASSERT(size == sizeof(struct ldlm_lock));
@@ -362,7 +356,6 @@ static void lock_handle_free(void *lock, int size)
}
static struct portals_handle_ops lock_handle_ops = {
- .hop_addref = lock_handle_addref,
.hop_free = lock_handle_free,
};
@@ -387,7 +380,7 @@ static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource)
spin_lock_init(&lock->l_lock);
lock->l_resource = resource;
- atomic_set(&lock->l_refc, 2);
+ refcount_set(&lock->l_handle.h_ref, 2);
INIT_LIST_HEAD(&lock->l_res_link);
INIT_LIST_HEAD(&lock->l_lru);
INIT_LIST_HEAD(&lock->l_pending_chain);
@@ -1974,13 +1967,13 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
&vaf,
lock,
lock->l_handle.h_cookie,
- atomic_read(&lock->l_refc),
+ refcount_read(&lock->l_handle.h_ref),
lock->l_readers, lock->l_writers,
ldlm_lockname[lock->l_granted_mode],
ldlm_lockname[lock->l_req_mode],
lock->l_flags, nid,
lock->l_remote_handle.cookie,
- exp ? refcount_read(&exp->exp_refcount) : -99,
+ exp ? refcount_read(&exp->exp_handle.h_ref) : -99,
lock->l_pid, lock->l_callback_timeout,
lock->l_lvb_type);
va_end(args);
@@ -1994,7 +1987,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
&vaf,
ldlm_lock_to_ns_name(lock), lock,
lock->l_handle.h_cookie,
- atomic_read(&lock->l_refc),
+ refcount_read(&lock->l_handle.h_ref),
lock->l_readers, lock->l_writers,
ldlm_lockname[lock->l_granted_mode],
ldlm_lockname[lock->l_req_mode],
@@ -2007,7 +2000,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
lock->l_req_extent.end,
lock->l_flags, nid,
lock->l_remote_handle.cookie,
- exp ? refcount_read(&exp->exp_refcount) : -99,
+ exp ? refcount_read(&exp->exp_handle.h_ref) : -99,
lock->l_pid, lock->l_callback_timeout,
lock->l_lvb_type);
break;
@@ -2018,7 +2011,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
&vaf,
ldlm_lock_to_ns_name(lock), lock,
lock->l_handle.h_cookie,
- atomic_read(&lock->l_refc),
+ refcount_read(&lock->l_handle.h_ref),
lock->l_readers, lock->l_writers,
ldlm_lockname[lock->l_granted_mode],
ldlm_lockname[lock->l_req_mode],
@@ -2030,7 +2023,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
lock->l_policy_data.l_flock.end,
lock->l_flags, nid,
lock->l_remote_handle.cookie,
- exp ? refcount_read(&exp->exp_refcount) : -99,
+ exp ? refcount_read(&exp->exp_handle.h_ref) : -99,
lock->l_pid, lock->l_callback_timeout);
break;
@@ -2040,7 +2033,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
&vaf,
ldlm_lock_to_ns_name(lock),
lock, lock->l_handle.h_cookie,
- atomic_read(&lock->l_refc),
+ refcount_read(&lock->l_handle.h_ref),
lock->l_readers, lock->l_writers,
ldlm_lockname[lock->l_granted_mode],
ldlm_lockname[lock->l_req_mode],
@@ -2050,7 +2043,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
ldlm_typename[resource->lr_type],
lock->l_flags, nid,
lock->l_remote_handle.cookie,
- exp ? refcount_read(&exp->exp_refcount) : -99,
+ exp ? refcount_read(&exp->exp_handle.h_ref) : -99,
lock->l_pid, lock->l_callback_timeout,
lock->l_lvb_type);
break;
@@ -2061,7 +2054,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
&vaf,
ldlm_lock_to_ns_name(lock),
lock, lock->l_handle.h_cookie,
- atomic_read(&lock->l_refc),
+ refcount_read(&lock->l_handle.h_ref),
lock->l_readers, lock->l_writers,
ldlm_lockname[lock->l_granted_mode],
ldlm_lockname[lock->l_req_mode],
@@ -2070,7 +2063,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
ldlm_typename[resource->lr_type],
lock->l_flags, nid,
lock->l_remote_handle.cookie,
- exp ? refcount_read(&exp->exp_refcount) : -99,
+ exp ? refcount_read(&exp->exp_handle.h_ref) : -99,
lock->l_pid, lock->l_callback_timeout,
lock->l_lvb_type);
break;
@@ -719,7 +719,7 @@ static void class_export_destroy(struct obd_export *exp)
{
struct obd_device *obd = exp->exp_obd;
- LASSERT(refcount_read(&exp->exp_refcount) == 0);
+ LASSERT(refcount_read(&exp->exp_handle.h_ref) == 0);
LASSERT(obd);
CDEBUG(D_IOCTL, "destroying export %p/%s for %s\n", exp,
@@ -743,33 +743,27 @@ static void class_export_destroy(struct obd_export *exp)
OBD_FREE_RCU(exp, sizeof(*exp), &exp->exp_handle);
}
-static void export_handle_addref(void *export)
-{
- class_export_get(export);
-}
-
static struct portals_handle_ops export_handle_ops = {
- .hop_addref = export_handle_addref,
.hop_free = NULL,
};
struct obd_export *class_export_get(struct obd_export *exp)
{
- refcount_inc(&exp->exp_refcount);
+ refcount_inc(&exp->exp_handle.h_ref);
CDEBUG(D_INFO, "GETting export %p : new refcount %d\n", exp,
- refcount_read(&exp->exp_refcount));
+ refcount_read(&exp->exp_handle.h_ref));
return exp;
}
EXPORT_SYMBOL(class_export_get);
void class_export_put(struct obd_export *exp)
{
- LASSERT(refcount_read(&exp->exp_refcount) > 0);
- LASSERT(refcount_read(&exp->exp_refcount) < LI_POISON);
+ LASSERT(refcount_read(&exp->exp_handle.h_ref) > 0);
+ LASSERT(refcount_read(&exp->exp_handle.h_ref) < LI_POISON);
CDEBUG(D_INFO, "PUTting export %p : new refcount %d\n", exp,
- refcount_read(&exp->exp_refcount) - 1);
+ refcount_read(&exp->exp_handle.h_ref) - 1);
- if (refcount_dec_and_test(&exp->exp_refcount)) {
+ if (refcount_dec_and_test(&exp->exp_handle.h_ref)) {
struct obd_device *obd = exp->exp_obd;
CDEBUG(D_IOCTL, "final put %p/%s\n",
@@ -819,7 +813,7 @@ static struct obd_export *__class_new_export(struct obd_device *obd,
export->exp_conn_cnt = 0;
/* 2 = class_handle_hash + last */
- refcount_set(&export->exp_refcount, 2);
+ refcount_set(&export->exp_handle.h_ref, 2);
atomic_set(&export->exp_rpc_count, 0);
atomic_set(&export->exp_cb_count, 0);
atomic_set(&export->exp_locks_count, 0);
@@ -922,7 +916,7 @@ static void class_import_destroy(struct obd_import *imp)
CDEBUG(D_IOCTL, "destroying import %p for %s\n", imp,
imp->imp_obd->obd_name);
- LASSERT_ATOMIC_ZERO(&imp->imp_refcount);
+ LASSERT(refcount_read(&imp->imp_handle.h_ref) == 0);
ptlrpc_put_connection_superhack(imp->imp_connection);
@@ -939,21 +933,15 @@ static void class_import_destroy(struct obd_import *imp)
OBD_FREE_RCU(imp, sizeof(*imp), &imp->imp_handle);
}
-static void import_handle_addref(void *import)
-{
- class_import_get(import);
-}
-
static struct portals_handle_ops import_handle_ops = {
- .hop_addref = import_handle_addref,
.hop_free = NULL,
};
struct obd_import *class_import_get(struct obd_import *import)
{
- atomic_inc(&import->imp_refcount);
+ refcount_inc(&import->imp_handle.h_ref);
CDEBUG(D_INFO, "import %p refcount=%d obd=%s\n", import,
- atomic_read(&import->imp_refcount),
+ refcount_read(&import->imp_handle.h_ref),
import->imp_obd->obd_name);
return import;
}
@@ -961,19 +949,19 @@ EXPORT_SYMBOL(class_import_get);
void class_import_put(struct obd_import *imp)
{
- LASSERT_ATOMIC_GT_LT(&imp->imp_refcount, 0, LI_POISON);
+ LASSERT(refcount_read(&imp->imp_handle.h_ref) > 0);
CDEBUG(D_INFO, "import %p refcount=%d obd=%s\n", imp,
- atomic_read(&imp->imp_refcount) - 1,
+ refcount_read(&imp->imp_handle.h_ref) - 1,
imp->imp_obd->obd_name);
- if (atomic_dec_and_test(&imp->imp_refcount)) {
+ if (refcount_dec_and_test(&imp->imp_handle.h_ref)) {
CDEBUG(D_INFO, "final put import %p\n", imp);
obd_zombie_import_add(imp);
}
/* catch possible import put race */
- LASSERT_ATOMIC_GE_LT(&imp->imp_refcount, 0, LI_POISON);
+ LASSERT(refcount_read(&imp->imp_handle.h_ref) >= 0);
}
EXPORT_SYMBOL(class_import_put);
@@ -1023,7 +1011,7 @@ struct obd_import *class_new_import(struct obd_device *obd)
init_waitqueue_head(&imp->imp_recovery_waitq);
INIT_WORK(&imp->imp_zombie_work, obd_zombie_imp_cull);
- atomic_set(&imp->imp_refcount, 2);
+ refcount_set(&imp->imp_handle.h_ref, 2);
atomic_set(&imp->imp_unregistering, 0);
atomic_set(&imp->imp_inflight, 0);
atomic_set(&imp->imp_replay_inflight, 0);
@@ -152,7 +152,7 @@ void *class_handle2object(u64 cookie, const struct portals_handle_ops *ops)
spin_lock(&h->h_lock);
if (likely(h->h_in != 0)) {
- h->h_ops->hop_addref(h);
+ refcount_inc(&h->h_ref);
retval = h;
}
spin_unlock(&h->h_lock);
@@ -1638,7 +1638,7 @@ static int echo_client_cleanup(struct obd_device *obddev)
return -EBUSY;
}
- LASSERT(refcount_read(&ec->ec_exp->exp_refcount) > 0);
+ LASSERT(refcount_read(&ec->ec_exp->exp_handle.h_ref) > 0);
rc = obd_disconnect(ec->ec_exp);
if (rc != 0)
CERROR("fail to disconnect device: %d\n", rc);
@@ -1697,7 +1697,7 @@ ptlrpc_server_handle_request(struct ptlrpc_service_part *svcpt,
(request->rq_export ?
(char *)request->rq_export->exp_client_uuid.uuid : "0"),
(request->rq_export ?
- refcount_read(&request->rq_export->exp_refcount) : -99),
+ refcount_read(&request->rq_export->exp_handle.h_ref) : -99),
lustre_msg_get_status(request->rq_reqmsg), request->rq_xid,
libcfs_id2str(request->rq_peer),
lustre_msg_get_opc(request->rq_reqmsg));
@@ -1741,7 +1741,7 @@ ptlrpc_server_handle_request(struct ptlrpc_service_part *svcpt,
(request->rq_export ?
(char *)request->rq_export->exp_client_uuid.uuid : "0"),
(request->rq_export ?
- refcount_read(&request->rq_export->exp_refcount) : -99),
+ refcount_read(&request->rq_export->exp_handle.h_ref) : -99),
lustre_msg_get_status(request->rq_reqmsg),
request->rq_xid,
libcfs_id2str(request->rq_peer),
Every object with a lustre_handle has (and must have) a refcount. The lustre_handles code needs a call-out to increment this. To simplify things, move the refcount into the lustre_handle and discard the call-out. Signed-off-by: NeilBrown <neilb@suse.com> --- drivers/staging/lustre/lustre/include/lustre_dlm.h | 6 --- .../staging/lustre/lustre/include/lustre_export.h | 1 .../staging/lustre/lustre/include/lustre_handles.h | 2 - .../staging/lustre/lustre/include/lustre_import.h | 2 - drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 35 ++++++---------- drivers/staging/lustre/lustre/obdclass/genops.c | 44 +++++++------------- .../lustre/lustre/obdclass/lustre_handles.c | 2 - .../staging/lustre/lustre/obdecho/echo_client.c | 2 - drivers/staging/lustre/lustre/ptlrpc/service.c | 4 +- 9 files changed, 35 insertions(+), 63 deletions(-)