diff options
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
-rw-r--r-- | fs/ocfs2/dlmglue.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 1ba67df00924..2bb868b7b44f 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c | |||
@@ -297,7 +297,7 @@ static inline int ocfs2_is_inode_lock(struct ocfs2_lock_res *lockres) | |||
297 | lockres->l_type == OCFS2_LOCK_TYPE_OPEN; | 297 | lockres->l_type == OCFS2_LOCK_TYPE_OPEN; |
298 | } | 298 | } |
299 | 299 | ||
300 | static inline struct ocfs2_lock_res *ocfs2_lksb_to_lock_res(union ocfs2_dlm_lksb *lksb) | 300 | static inline struct ocfs2_lock_res *ocfs2_lksb_to_lock_res(struct ocfs2_dlm_lksb *lksb) |
301 | { | 301 | { |
302 | return container_of(lksb, struct ocfs2_lock_res, l_lksb); | 302 | return container_of(lksb, struct ocfs2_lock_res, l_lksb); |
303 | } | 303 | } |
@@ -1046,7 +1046,7 @@ static unsigned int lockres_set_pending(struct ocfs2_lock_res *lockres) | |||
1046 | } | 1046 | } |
1047 | 1047 | ||
1048 | 1048 | ||
1049 | static void ocfs2_blocking_ast(union ocfs2_dlm_lksb *lksb, int level) | 1049 | static void ocfs2_blocking_ast(struct ocfs2_dlm_lksb *lksb, int level) |
1050 | { | 1050 | { |
1051 | struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb); | 1051 | struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb); |
1052 | struct ocfs2_super *osb = ocfs2_get_lockres_osb(lockres); | 1052 | struct ocfs2_super *osb = ocfs2_get_lockres_osb(lockres); |
@@ -1077,7 +1077,7 @@ static void ocfs2_blocking_ast(union ocfs2_dlm_lksb *lksb, int level) | |||
1077 | ocfs2_wake_downconvert_thread(osb); | 1077 | ocfs2_wake_downconvert_thread(osb); |
1078 | } | 1078 | } |
1079 | 1079 | ||
1080 | static void ocfs2_locking_ast(union ocfs2_dlm_lksb *lksb) | 1080 | static void ocfs2_locking_ast(struct ocfs2_dlm_lksb *lksb) |
1081 | { | 1081 | { |
1082 | struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb); | 1082 | struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb); |
1083 | struct ocfs2_super *osb = ocfs2_get_lockres_osb(lockres); | 1083 | struct ocfs2_super *osb = ocfs2_get_lockres_osb(lockres); |
@@ -3058,7 +3058,7 @@ void ocfs2_dlm_shutdown(struct ocfs2_super *osb, | |||
3058 | mlog_exit_void(); | 3058 | mlog_exit_void(); |
3059 | } | 3059 | } |
3060 | 3060 | ||
3061 | static void ocfs2_unlock_ast(union ocfs2_dlm_lksb *lksb, int error) | 3061 | static void ocfs2_unlock_ast(struct ocfs2_dlm_lksb *lksb, int error) |
3062 | { | 3062 | { |
3063 | struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb); | 3063 | struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb); |
3064 | unsigned long flags; | 3064 | unsigned long flags; |