diff options
Diffstat (limited to 'fs/ocfs2/stack_user.c')
| -rw-r--r-- | fs/ocfs2/stack_user.c | 16 | 
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index 129b93159cca..31276bac78f5 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c  | |||
| @@ -665,7 +665,7 @@ static void ocfs2_control_exit(void) | |||
| 665 | 665 | ||
| 666 | static void fsdlm_lock_ast_wrapper(void *astarg) | 666 | static void fsdlm_lock_ast_wrapper(void *astarg) | 
| 667 | { | 667 | { | 
| 668 | union 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); | 671 | BUG_ON(ocfs2_user_plugin.sp_proto == NULL); | 
| @@ -688,7 +688,7 @@ static void fsdlm_lock_ast_wrapper(void *astarg) | |||
| 688 | 688 | ||
| 689 | static void fsdlm_blocking_ast_wrapper(void *astarg, int level) | 689 | static void fsdlm_blocking_ast_wrapper(void *astarg, int level) | 
| 690 | { | 690 | { | 
| 691 | union ocfs2_dlm_lksb *lksb = astarg; | 691 | struct ocfs2_dlm_lksb *lksb = astarg; | 
| 692 | 692 | ||
| 693 | BUG_ON(ocfs2_user_plugin.sp_proto == NULL); | 693 | BUG_ON(ocfs2_user_plugin.sp_proto == NULL); | 
| 694 | 694 | ||
| @@ -697,7 +697,7 @@ static void fsdlm_blocking_ast_wrapper(void *astarg, int level) | |||
| 697 | 697 | ||
| 698 | static int user_dlm_lock(struct ocfs2_cluster_connection *conn, | 698 | static int user_dlm_lock(struct ocfs2_cluster_connection *conn, | 
| 699 | int mode, | 699 | int mode, | 
| 700 | union ocfs2_dlm_lksb *lksb, | 700 | struct ocfs2_dlm_lksb *lksb, | 
| 701 | u32 flags, | 701 | u32 flags, | 
| 702 | void *name, | 702 | void *name, | 
| 703 | unsigned int namelen) | 703 | unsigned int namelen) | 
| @@ -716,7 +716,7 @@ static int user_dlm_lock(struct ocfs2_cluster_connection *conn, | |||
| 716 | } | 716 | } | 
| 717 | 717 | ||
| 718 | static int user_dlm_unlock(struct ocfs2_cluster_connection *conn, | 718 | static int user_dlm_unlock(struct ocfs2_cluster_connection *conn, | 
| 719 | union ocfs2_dlm_lksb *lksb, | 719 | struct ocfs2_dlm_lksb *lksb, | 
| 720 | u32 flags) | 720 | u32 flags) | 
| 721 | { | 721 | { | 
| 722 | int ret; | 722 | int ret; | 
| @@ -726,19 +726,19 @@ static int user_dlm_unlock(struct ocfs2_cluster_connection *conn, | |||
| 726 | return ret; | 726 | return ret; | 
| 727 | } | 727 | } | 
| 728 | 728 | ||
| 729 | static int user_dlm_lock_status(union ocfs2_dlm_lksb *lksb) | 729 | static int user_dlm_lock_status(struct ocfs2_dlm_lksb *lksb) | 
| 730 | { | 730 | { | 
| 731 | return lksb->lksb_fsdlm.sb_status; | 731 | return lksb->lksb_fsdlm.sb_status; | 
| 732 | } | 732 | } | 
| 733 | 733 | ||
| 734 | static int user_dlm_lvb_valid(union ocfs2_dlm_lksb *lksb) | 734 | static int user_dlm_lvb_valid(struct ocfs2_dlm_lksb *lksb) | 
| 735 | { | 735 | { | 
| 736 | int invalid = lksb->lksb_fsdlm.sb_flags & DLM_SBF_VALNOTVALID; | 736 | int invalid = lksb->lksb_fsdlm.sb_flags & DLM_SBF_VALNOTVALID; | 
| 737 | 737 | ||
| 738 | return !invalid; | 738 | return !invalid; | 
| 739 | } | 739 | } | 
| 740 | 740 | ||
| 741 | static void *user_dlm_lvb(union ocfs2_dlm_lksb *lksb) | 741 | static void *user_dlm_lvb(struct ocfs2_dlm_lksb *lksb) | 
| 742 | { | 742 | { | 
| 743 | if (!lksb->lksb_fsdlm.sb_lvbptr) | 743 | if (!lksb->lksb_fsdlm.sb_lvbptr) | 
| 744 | lksb->lksb_fsdlm.sb_lvbptr = (char *)lksb + | 744 | lksb->lksb_fsdlm.sb_lvbptr = (char *)lksb + | 
| @@ -746,7 +746,7 @@ static void *user_dlm_lvb(union ocfs2_dlm_lksb *lksb) | |||
| 746 | return (void *)(lksb->lksb_fsdlm.sb_lvbptr); | 746 | return (void *)(lksb->lksb_fsdlm.sb_lvbptr); | 
| 747 | } | 747 | } | 
| 748 | 748 | ||
| 749 | static void user_dlm_dump_lksb(union ocfs2_dlm_lksb *lksb) | 749 | static void user_dlm_dump_lksb(struct ocfs2_dlm_lksb *lksb) | 
| 750 | { | 750 | { | 
| 751 | } | 751 | } | 
| 752 | 752 | ||
