X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_lock.c;h=e7a507292e466c81110b79776aaca2c3559a8c97;hb=98c2e6b446166ba8f89e60a0d4f38683b920f506;hp=760d2c21a7694374be4246d3eac74293609826e9;hpb=9c4d506c5feae8023b49781b31b25b8ef3f8123f;p=fs%2Flustre-release.git

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 760d2c2..e7a5072 100644
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -196,7 +196,7 @@ EXPORT_SYMBOL(ldlm_register_intent);
  */
 struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock)
 {
-        cfs_atomic_inc(&lock->l_refc);
+	atomic_inc(&lock->l_refc);
         return lock;
 }
 EXPORT_SYMBOL(ldlm_lock_get);
@@ -211,8 +211,8 @@ void ldlm_lock_put(struct ldlm_lock *lock)
         ENTRY;
 
         LASSERT(lock->l_resource != LP_POISON);
-        LASSERT(cfs_atomic_read(&lock->l_refc) > 0);
-        if (cfs_atomic_dec_and_test(&lock->l_refc)) {
+	LASSERT(atomic_read(&lock->l_refc) > 0);
+	if (atomic_dec_and_test(&lock->l_refc)) {
                 struct ldlm_resource *res;
 
                 LDLM_DEBUG(lock,
@@ -250,18 +250,17 @@ EXPORT_SYMBOL(ldlm_lock_put);
  */
 int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock)
 {
-        int rc = 0;
-        if (!cfs_list_empty(&lock->l_lru)) {
-                struct ldlm_namespace *ns = ldlm_lock_to_ns(lock);
-
-                LASSERT(lock->l_resource->lr_type != LDLM_FLOCK);
-                cfs_list_del_init(&lock->l_lru);
-		ldlm_clear_skipped(lock);
-                LASSERT(ns->ns_nr_unused > 0);
-                ns->ns_nr_unused--;
-                rc = 1;
-        }
-        return rc;
+	int rc = 0;
+	if (!cfs_list_empty(&lock->l_lru)) {
+		struct ldlm_namespace *ns = ldlm_lock_to_ns(lock);
+
+		LASSERT(lock->l_resource->lr_type != LDLM_FLOCK);
+		cfs_list_del_init(&lock->l_lru);
+		LASSERT(ns->ns_nr_unused > 0);
+		ns->ns_nr_unused--;
+		rc = 1;
+	}
+	return rc;
 }
 
 /**
@@ -290,14 +289,15 @@ int ldlm_lock_remove_from_lru(struct ldlm_lock *lock)
  */
 void ldlm_lock_add_to_lru_nolock(struct ldlm_lock *lock)
 {
-        struct ldlm_namespace *ns = ldlm_lock_to_ns(lock);
+	struct ldlm_namespace *ns = ldlm_lock_to_ns(lock);
 
-        lock->l_last_used = cfs_time_current();
-        LASSERT(cfs_list_empty(&lock->l_lru));
-        LASSERT(lock->l_resource->lr_type != LDLM_FLOCK);
-        cfs_list_add_tail(&lock->l_lru, &ns->ns_unused_list);
-        LASSERT(ns->ns_nr_unused >= 0);
-        ns->ns_nr_unused++;
+	lock->l_last_used = cfs_time_current();
+	LASSERT(cfs_list_empty(&lock->l_lru));
+	LASSERT(lock->l_resource->lr_type != LDLM_FLOCK);
+	cfs_list_add_tail(&lock->l_lru, &ns->ns_unused_list);
+	ldlm_clear_skipped(lock);
+	LASSERT(ns->ns_nr_unused >= 0);
+	ns->ns_nr_unused++;
 }
 
 /**
@@ -482,7 +482,7 @@ static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource)
         lock->l_resource = resource;
         lu_ref_add(&resource->lr_reference, "lock", lock);
 
-	cfs_atomic_set(&lock->l_refc, 2);
+	atomic_set(&lock->l_refc, 2);
 	CFS_INIT_LIST_HEAD(&lock->l_res_link);
 	CFS_INIT_LIST_HEAD(&lock->l_lru);
 	CFS_INIT_LIST_HEAD(&lock->l_pending_chain);
@@ -1703,7 +1703,7 @@ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns,
                  * need to do anything else. */
                 *flags &= ~(LDLM_FL_BLOCK_GRANTED |
                             LDLM_FL_BLOCK_CONV | LDLM_FL_BLOCK_WAIT);
-                GOTO(out, ELDLM_OK);
+		GOTO(out, rc = ELDLM_OK);
         }
 
         ldlm_resource_unlink_lock(lock);
@@ -1741,18 +1741,18 @@ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns,
                         ldlm_resource_add_lock(res, &res->lr_waiting, lock);
                 else
                         ldlm_grant_lock(lock, NULL);
-                GOTO(out, ELDLM_OK);
+		GOTO(out, rc = ELDLM_OK);
 #ifdef HAVE_SERVER_SUPPORT
         } else if (*flags & LDLM_FL_REPLAY) {
                 if (*flags & LDLM_FL_BLOCK_CONV) {
                         ldlm_resource_add_lock(res, &res->lr_converting, lock);
-                        GOTO(out, ELDLM_OK);
+			GOTO(out, rc = ELDLM_OK);
                 } else if (*flags & LDLM_FL_BLOCK_WAIT) {
                         ldlm_resource_add_lock(res, &res->lr_waiting, lock);
-                        GOTO(out, ELDLM_OK);
+			GOTO(out, rc = ELDLM_OK);
                 } else if (*flags & LDLM_FL_BLOCK_GRANTED) {
                         ldlm_grant_lock(lock, NULL);
-                        GOTO(out, ELDLM_OK);
+			GOTO(out, rc = ELDLM_OK);
                 }
                 /* If no flags, fall through to normal enqueue path. */
         }
@@ -1979,7 +1979,7 @@ int ldlm_run_ast_work(struct ldlm_namespace *ns, cfs_list_t *rpc_list,
 	if (arg == NULL)
 		RETURN(-ENOMEM);
 
-	cfs_atomic_set(&arg->restart, 0);
+	atomic_set(&arg->restart, 0);
 	arg->list = rpc_list;
 
 	switch (ast_type) {
@@ -2015,7 +2015,7 @@ int ldlm_run_ast_work(struct ldlm_namespace *ns, cfs_list_t *rpc_list,
 	ptlrpc_set_wait(arg->set);
 	ptlrpc_set_destroy(arg->set);
 
-	rc = cfs_atomic_read(&arg->restart) ? -ERESTART : 0;
+	rc = atomic_read(&arg->restart) ? -ERESTART : 0;
 	GOTO(out, rc);
 out:
 	OBD_FREE_PTR(arg);
@@ -2236,7 +2236,7 @@ int ldlm_cancel_locks_for_export_cb(cfs_hash_t *hs, cfs_hash_bd_t *bd,
 		       "Cancel lock %p for export %p (loop %d), still have "
 		       "%d locks left on hash table.\n",
 		       lock, exp, ecl->ecl_loop,
-		       cfs_atomic_read(&hs->hs_count));
+		       atomic_read(&hs->hs_count));
 	}
 
 	return 0;
@@ -2471,12 +2471,12 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
                        "remote: "LPX64" expref: %d pid: %u timeout: %lu "
 		       "lvb_type: %d\n",
                        lock,
-                       lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc),
+		       lock->l_handle.h_cookie, atomic_read(&lock->l_refc),
                        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 ? cfs_atomic_read(&exp->exp_refcount) : -99,
+		       exp ? atomic_read(&exp->exp_refcount) : -99,
                        lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type);
                 va_end(args);
                 return;
@@ -2490,18 +2490,18 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
 			"(req "LPU64"->"LPU64") flags: "LPX64" nid: %s remote: "
 			LPX64" expref: %d pid: %u timeout: %lu lvb_type: %d\n",
 			ldlm_lock_to_ns_name(lock), lock,
-			lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc),
+			lock->l_handle.h_cookie, atomic_read(&lock->l_refc),
 			lock->l_readers, lock->l_writers,
 			ldlm_lockname[lock->l_granted_mode],
 			ldlm_lockname[lock->l_req_mode],
 			PLDLMRES(resource),
-			cfs_atomic_read(&resource->lr_refcount),
+			atomic_read(&resource->lr_refcount),
 			ldlm_typename[resource->lr_type],
 			lock->l_policy_data.l_extent.start,
 			lock->l_policy_data.l_extent.end,
 			lock->l_req_extent.start, lock->l_req_extent.end,
 			lock->l_flags, nid, lock->l_remote_handle.cookie,
-			exp ? cfs_atomic_read(&exp->exp_refcount) : -99,
+			exp ? atomic_read(&exp->exp_refcount) : -99,
 			lock->l_pid, lock->l_callback_timeout,
 			lock->l_lvb_type);
 		break;
@@ -2513,18 +2513,18 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
 			"["LPU64"->"LPU64"] flags: "LPX64" nid: %s "
 			"remote: "LPX64" expref: %d pid: %u timeout: %lu\n",
 			ldlm_lock_to_ns_name(lock), lock,
-			lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc),
+			lock->l_handle.h_cookie, atomic_read(&lock->l_refc),
 			lock->l_readers, lock->l_writers,
 			ldlm_lockname[lock->l_granted_mode],
 			ldlm_lockname[lock->l_req_mode],
 			PLDLMRES(resource),
-			cfs_atomic_read(&resource->lr_refcount),
+			atomic_read(&resource->lr_refcount),
 			ldlm_typename[resource->lr_type],
 			lock->l_policy_data.l_flock.pid,
 			lock->l_policy_data.l_flock.start,
 			lock->l_policy_data.l_flock.end,
 			lock->l_flags, nid, lock->l_remote_handle.cookie,
-			exp ? cfs_atomic_read(&exp->exp_refcount) : -99,
+			exp ? atomic_read(&exp->exp_refcount) : -99,
 			lock->l_pid, lock->l_callback_timeout);
 		break;
 
@@ -2536,16 +2536,16 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
 			"pid: %u timeout: %lu lvb_type: %d\n",
 			ldlm_lock_to_ns_name(lock),
 			lock, lock->l_handle.h_cookie,
-			cfs_atomic_read(&lock->l_refc),
+			atomic_read(&lock->l_refc),
 			lock->l_readers, lock->l_writers,
 			ldlm_lockname[lock->l_granted_mode],
 			ldlm_lockname[lock->l_req_mode],
 			PLDLMRES(resource),
 			lock->l_policy_data.l_inodebits.bits,
-			cfs_atomic_read(&resource->lr_refcount),
+			atomic_read(&resource->lr_refcount),
 			ldlm_typename[resource->lr_type],
 			lock->l_flags, nid, lock->l_remote_handle.cookie,
-			exp ? cfs_atomic_read(&exp->exp_refcount) : -99,
+			exp ? atomic_read(&exp->exp_refcount) : -99,
 			lock->l_pid, lock->l_callback_timeout,
 			lock->l_lvb_type);
 		break;
@@ -2558,15 +2558,15 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
 			"timeout: %lu lvb_type: %d\n",
 			ldlm_lock_to_ns_name(lock),
 			lock, lock->l_handle.h_cookie,
-			cfs_atomic_read(&lock->l_refc),
+			atomic_read(&lock->l_refc),
 			lock->l_readers, lock->l_writers,
 			ldlm_lockname[lock->l_granted_mode],
 			ldlm_lockname[lock->l_req_mode],
 			PLDLMRES(resource),
-			cfs_atomic_read(&resource->lr_refcount),
+			atomic_read(&resource->lr_refcount),
 			ldlm_typename[resource->lr_type],
 			lock->l_flags, nid, lock->l_remote_handle.cookie,
-			exp ? cfs_atomic_read(&exp->exp_refcount) : -99,
+			exp ? atomic_read(&exp->exp_refcount) : -99,
 			lock->l_pid, lock->l_callback_timeout,
 			lock->l_lvb_type);
 		break;