Little fixes proposed by Andreas after inspection.

b=11301

diff --git a/lustre/ldlm/ldlm_internal.h b/lustre/ldlm/ldlm_internal.h
index 5b4b0dd..25ac511 100644 (file)
--- a/lustre/ldlm/ldlm_internal.h
+++ b/lustre/ldlm/ldlm_internal.h
@@ -56,7 +56,7 @@ void ldlm_resource_insert_lock_after(struct ldlm_lock *original,
 struct ldlm_cb_set_arg {
         struct ptlrpc_request_set *set;
         atomic_t restart;
-        __u16 type; /* LDLM_BL_CALLBACK or LDLM_CP_CALLBACK */
+        __u32 type; /* LDLM_BL_CALLBACK or LDLM_CP_CALLBACK */
 };
 
 void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list);

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 268c705..7eb6127 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -560,7 +560,7 @@ int ldlm_server_blocking_ast(struct ldlm_lock *lock,
                              struct ldlm_lock_desc *desc,
                              void *data, int flag)
 {
-        struct ldlm_cb_set_arg *arg = (struct ldlm_cb_set_arg *)data;
+        struct ldlm_cb_set_arg *arg = data;
         struct ldlm_request *body;
         struct ptlrpc_request *req;
         int size[] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
@@ -642,7 +642,7 @@ int ldlm_server_blocking_ast(struct ldlm_lock *lock,
 
 int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data)
 {
-        struct ldlm_cb_set_arg *arg = (struct ldlm_cb_set_arg *)data;
+        struct ldlm_cb_set_arg *arg = data;
         struct ldlm_request *body;
         struct ptlrpc_request *req;
         struct timeval granted_time;