staging: lustre: ldlm: use list_first_entry in ldlm_lock (ef7e70ae) · Commits · 戴 / test

drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1687,7 +1687,7 @@ ldlm_work_bl_ast_lock(struct ptlrpc_request_set rqset, void opaq)
		if (list_empty(arg->list))
		return -ENOENT;

		lock = list_entry(arg->list->next, struct ldlm_lock, l_bl_ast);
		lock = list_first_entry(arg->list, struct ldlm_lock, l_bl_ast);

		/* nobody should touch l_bl_ast */
		lock_res_and_lock(lock);
		@@ -1723,7 +1723,7 @@ ldlm_work_cp_ast_lock(struct ptlrpc_request_set rqset, void opaq)
		if (list_empty(arg->list))
		return -ENOENT;

		lock = list_entry(arg->list->next, struct ldlm_lock, l_cp_ast);
		lock = list_first_entry(arg->list, struct ldlm_lock, l_cp_ast);

		/* It's possible to receive a completion AST before we've set
		* the l_completion_ast pointer: either because the AST arrived
		@@ -1769,7 +1769,7 @@ ldlm_work_revoke_ast_lock(struct ptlrpc_request_set rqset, void opaq)
		if (list_empty(arg->list))
		return -ENOENT;

		lock = list_entry(arg->list->next, struct ldlm_lock, l_rk_ast);
		lock = list_first_entry(arg->list, struct ldlm_lock, l_rk_ast);
		list_del_init(&lock->l_rk_ast);

		/* the desc just pretend to exclusive */
		@@ -1796,7 +1796,7 @@ static int ldlm_work_gl_ast_lock(struct ptlrpc_request_set rqset, void opaq)
		if (list_empty(arg->list))
		return -ENOENT;

		gl_work = list_entry(arg->list->next, struct ldlm_glimpse_work,
		gl_work = list_first_entry(arg->list, struct ldlm_glimpse_work,
		gl_list);
		list_del_init(&gl_work->gl_list);