#include <linux/lustre_dlm.h>
int ldlm_cli_enqueue(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+ struct lustre_handle *connh,
struct ptlrpc_request *req,
struct ldlm_namespace *ns,
struct lustre_handle *parent_lock_handle,
data, data_len);
if (lock == NULL)
GOTO(out, rc = -ENOMEM);
-
LDLM_DEBUG(lock, "client-side enqueue START");
+ /* for the local lock, add the reference */
+ ldlm_lock_addref_internal(lock, mode);
+ ldlm_lock2handle(lock, lockh);
if (req == NULL) {
- req = ptlrpc_prep_req(cl, conn, LDLM_ENQUEUE, 1, &size, NULL);
+ req = ptlrpc_prep_req2(cl, conn, connh,
+ LDLM_ENQUEUE, 1, &size, NULL);
if (!req)
GOTO(out, rc = -ENOMEM);
req_passed_in = 0;
/* Dump all of this data into the request buffer */
body = lustre_msg_buf(req->rq_reqmsg, 0);
- body->lock_desc.l_resource.lr_type = type;
- memcpy(body->lock_desc.l_resource.lr_name, res_id,
- sizeof(body->lock_desc.l_resource.lr_name));
-
- body->lock_desc.l_req_mode = mode;
+ ldlm_lock2desc(lock, &body->lock_desc);
+ /* Phil: make this part of ldlm_lock2desc */
if (type == LDLM_EXTENT)
memcpy(&body->lock_desc.l_extent, cookie,
sizeof(body->lock_desc.l_extent));
body->lock_flags = *flags;
- ldlm_lock2handle(lock, &body->lock_handle1);
+ memcpy(&body->lock_handle1, lockh, sizeof(*lockh));
if (parent_lock_handle)
memcpy(&body->lock_handle2, parent_lock_handle,
sizeof(body->lock_handle2));
req->rq_replen = lustre_msg_size(1, &size);
}
- lock->l_connection = conn;
+ lock->l_connection = ptlrpc_connection_addref(conn);
lock->l_client = cl;
rc = ptlrpc_queue_wait(req);
+ /* FIXME: status check here? */
rc = ptlrpc_check_status(req, rc);
if (rc != ELDLM_OK) {
LDLM_DEBUG(lock, "client-side enqueue END (%s)",
rc == ELDLM_LOCK_ABORTED ? "ABORTED" : "FAILED");
- ldlm_lock_put(lock);
+ LDLM_LOCK_PUT(lock);
+ ldlm_lock_decref(lockh, mode);
+ /* FIXME: if we've already received a completion AST, this will
+ * LBUG! */
+ ldlm_lock_destroy(lock);
GOTO(out, rc);
}
/* If enqueue returned a blocked lock but the completion handler has
* already run, then it fixed up the resource and we don't need to do it
* again. */
- if (*flags & LDLM_FL_LOCK_CHANGED &&
+ if ((*flags) & LDLM_FL_LOCK_CHANGED &&
lock->l_req_mode != lock->l_granted_mode) {
CDEBUG(D_INFO, "remote intent success, locking %ld instead of"
"%ld\n", (long)reply->lock_resource_name[0],
ptlrpc_free_req(req);
rc = ldlm_lock_enqueue(lock, cookie, cookielen, flags, callback,
- callback);
+ callback);
- LDLM_DEBUG(lock, "client-side enqueue END");
if (*flags & (LDLM_FL_BLOCK_WAIT | LDLM_FL_BLOCK_GRANTED |
LDLM_FL_BLOCK_CONV)) {
/* Go to sleep until the lock is granted. */
/* FIXME: or cancelled. */
- CDEBUG(D_NET, "enqueue returned a blocked lock (%p), "
- "going to sleep.\n", lock);
+ LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock,"
+ " sleeping");
ldlm_lock_dump(lock);
- wait_event_interruptible(lock->l_waitq, lock->l_req_mode ==
- lock->l_granted_mode);
- CDEBUG(D_NET, "waking up, the lock must be granted.\n");
+#warning ldlm needs to time out
+ wait_event(lock->l_waitq,
+ lock->l_req_mode == lock->l_granted_mode);
+ LDLM_DEBUG(lock, "client-side enqueue waking up: granted");
}
- ldlm_lock_put(lock);
+ LDLM_DEBUG(lock, "client-side enqueue END");
+ LDLM_LOCK_PUT(lock);
EXIT;
out:
return rc;
}
-int ldlm_cli_callback(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
- void *data, __u32 data_len, struct ptlrpc_request **reqp)
+int ldlm_match_or_enqueue(struct ptlrpc_client *cl,
+ struct ptlrpc_connection *conn,
+ struct lustre_handle *connh,
+ struct ptlrpc_request *req,
+ struct ldlm_namespace *ns,
+ struct lustre_handle *parent_lock_handle,
+ __u64 *res_id,
+ __u32 type,
+ void *cookie, int cookielen,
+ ldlm_mode_t mode,
+ int *flags,
+ ldlm_lock_callback callback,
+ void *data,
+ __u32 data_len,
+ struct lustre_handle *lockh)
{
+ int rc;
+ ENTRY;
+ rc = ldlm_lock_match(ns, res_id, type, cookie, cookielen, mode, lockh);
+ if (rc == 0) {
+ rc = ldlm_cli_enqueue(cl, conn, connh, req, ns,
+ parent_lock_handle, res_id, type, cookie,
+ cookielen, mode, flags, callback, data,
+ data_len, lockh);
+ if (rc != ELDLM_OK)
+ CERROR("ldlm_cli_enqueue: err: %d\n", rc);
+ RETURN(rc);
+ } else
+ RETURN(0);
+}
+
+int ldlm_server_ast(struct lustre_handle *lockh, struct ldlm_lock_desc *desc,
+ void *data, __u32 data_len)
+{
+ struct ldlm_lock *lock;
struct ldlm_request *body;
struct ptlrpc_request *req;
- struct ptlrpc_client *cl =
- &lock->l_resource->lr_namespace->ns_rpc_client;
+ struct ptlrpc_client *cl;
int rc = 0, size = sizeof(*body);
ENTRY;
+ lock = ldlm_handle2lock(lockh);
+ if (lock == NULL) {
+ LBUG();
+ RETURN(-EINVAL);
+ }
+ cl = &lock->l_resource->lr_namespace->ns_rpc_client;
req = ptlrpc_prep_req(cl, lock->l_connection, LDLM_CALLBACK, 1,
&size, NULL);
if (!req)
}
LDLM_DEBUG(lock, "server preparing %s AST",
- desc->l_req_mode = 0 ? "completion" : "blocked");
+ desc == 0 ? "completion" : "blocked");
req->rq_replen = lustre_msg_size(0, NULL);
- if (reqp == NULL) {
- LBUG();
- rc = ptlrpc_queue_wait(req);
- rc = ptlrpc_check_status(req, rc);
- ptlrpc_free_req(req);
- } else
- *reqp = req;
+ rc = ptlrpc_queue_wait(req);
+ rc = ptlrpc_check_status(req, rc);
+ ptlrpc_free_req(req);
EXIT;
out:
+ LDLM_LOCK_PUT(lock);
return rc;
}
int ldlm_cli_convert(struct ptlrpc_client *cl, struct lustre_handle *lockh,
+ struct lustre_handle *connh,
int new_mode, int *flags)
{
struct ldlm_request *body;
ENTRY;
lock = ldlm_handle2lock(lockh);
- if (!lock)
- LBUG();
+ if (!lock) {
+ LBUG();
+ RETURN(-EINVAL);
+ }
*flags = 0;
LDLM_DEBUG(lock, "client-side convert");
- req = ptlrpc_prep_req(cl, lock->l_connection, LDLM_CONVERT, 1, &size,
- NULL);
+ req = ptlrpc_prep_req(cl, lock->l_connection,
+ LDLM_CONVERT, 1, &size, NULL);
if (!req)
GOTO(out, rc = -ENOMEM);
/* FIXME: or cancelled. */
CDEBUG(D_NET, "convert returned a blocked lock, "
"going to sleep.\n");
- wait_event_interruptible(lock->l_waitq, lock->l_req_mode ==
- lock->l_granted_mode);
+ wait_event(lock->l_waitq,
+ lock->l_req_mode == lock->l_granted_mode);
CDEBUG(D_NET, "waking up, the lock must be granted.\n");
}
- ldlm_lock_put(lock);
+ LDLM_LOCK_PUT(lock);
EXIT;
out:
ptlrpc_free_req(req);
return rc;
}
-int ldlm_cli_cancel(struct ptlrpc_client *cl, struct lustre_handle *lockh)
+int ldlm_cli_cancel(struct lustre_handle *lockh)
{
struct ptlrpc_request *req;
struct ldlm_lock *lock;
struct ldlm_request *body;
- struct ldlm_resource *res;
int rc, size = sizeof(*body);
ENTRY;
lock = ldlm_handle2lock(lockh);
- if (!lock)
- LBUG();
+ if (!lock) {
+ /* It's possible that the decref that we did just before this
+ * cancel was the last reader/writer, and caused a cancel before
+ * we could call this function. If we want to make this
+ * impossible (by adding a dec_and_cancel() or similar), then
+ * we can put the LBUG back. */
+ //LBUG();
+ RETURN(-EINVAL);
+ }
LDLM_DEBUG(lock, "client-side cancel");
- req = ptlrpc_prep_req(cl, lock->l_connection, LDLM_CANCEL, 1, &size,
- NULL);
+ req = ptlrpc_prep_req(lock->l_client, lock->l_connection,
+ LDLM_CANCEL, 1, &size, NULL);
if (!req)
GOTO(out, rc = -ENOMEM);
GOTO(out, rc);
ldlm_lock_cancel(lock);
- ldlm_reprocess_all(res);
- ldlm_lock_put(lock);
+ LDLM_LOCK_PUT(lock);
EXIT;
out:
return 0;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff