diff options
Diffstat (limited to 'fs/ocfs2/stack_user.c')
-rw-r--r-- | fs/ocfs2/stack_user.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index 31276bac78f5..b4cf616ef423 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c | |||
@@ -668,8 +668,6 @@ static void fsdlm_lock_ast_wrapper(void *astarg) | |||
668 | struct ocfs2_dlm_lksb *lksb = astarg; | 668 | struct ocfs2_dlm_lksb *lksb = astarg; |
669 | int status = lksb->lksb_fsdlm.sb_status; | 669 | int status = lksb->lksb_fsdlm.sb_status; |
670 | 670 | ||
671 | BUG_ON(ocfs2_user_plugin.sp_proto == NULL); | ||
672 | |||
673 | /* | 671 | /* |
674 | * For now we're punting on the issue of other non-standard errors | 672 | * For now we're punting on the issue of other non-standard errors |
675 | * where we can't tell if the unlock_ast or lock_ast should be called. | 673 | * where we can't tell if the unlock_ast or lock_ast should be called. |
@@ -681,18 +679,16 @@ static void fsdlm_lock_ast_wrapper(void *astarg) | |||
681 | */ | 679 | */ |
682 | 680 | ||
683 | if (status == -DLM_EUNLOCK || status == -DLM_ECANCEL) | 681 | if (status == -DLM_EUNLOCK || status == -DLM_ECANCEL) |
684 | ocfs2_user_plugin.sp_proto->lp_unlock_ast(lksb, 0); | 682 | lksb->lksb_conn->cc_proto->lp_unlock_ast(lksb, 0); |
685 | else | 683 | else |
686 | ocfs2_user_plugin.sp_proto->lp_lock_ast(lksb); | 684 | lksb->lksb_conn->cc_proto->lp_lock_ast(lksb); |
687 | } | 685 | } |
688 | 686 | ||
689 | static void fsdlm_blocking_ast_wrapper(void *astarg, int level) | 687 | static void fsdlm_blocking_ast_wrapper(void *astarg, int level) |
690 | { | 688 | { |
691 | struct ocfs2_dlm_lksb *lksb = astarg; | 689 | struct ocfs2_dlm_lksb *lksb = astarg; |
692 | 690 | ||
693 | BUG_ON(ocfs2_user_plugin.sp_proto == NULL); | 691 | lksb->lksb_conn->cc_proto->lp_blocking_ast(lksb, level); |
694 | |||
695 | ocfs2_user_plugin.sp_proto->lp_blocking_ast(lksb, level); | ||
696 | } | 692 | } |
697 | 693 | ||
698 | static int user_dlm_lock(struct ocfs2_cluster_connection *conn, | 694 | static int user_dlm_lock(struct ocfs2_cluster_connection *conn, |