ocfs2: get rid of ocfs2_is_o2cb_active function
PATCH 1/1 ocfs2: get rid of ocfs2_is_o2cb_active function
This patch is used to get rid of ocfs2_is_o2cb_active() function, Why? First, we had the similar functions to identify which cluster stack is being used via osb->osb_cluster_stack. Second, the current implementation of ocfs2_is_o2cb_active() function is not total safe, base on the design of stackglue, we need to get ocfs2_stack_lock lock before using ocfs2_stack related data structures, and that active_stack pointer can be NULL in case mount failure.
--- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/stackglue.c | 6 ------ fs/ocfs2/stackglue.h | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-)
fs/ocfs2/dlmglue.c +1 -1
@@ -3409,7 +3409,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb,* we can recover correctly from node failure. Otherwise, we may get * invalid LVB in LKB, but without DLM_SBF_VALNOTVALID being set. */ -if (!ocfs2_is_o2cb_active () && +if (ocfs2_userspace_stack (osb) && lockres->l_ops->flags &LOCK_TYPE_USES_LVB ) lvb =1 ;
fs/ocfs2/stackglue.c +0 -6
@@ -48,12 +48,6 @@*/ static struct ocfs2_stack_plugin *active_stack; -inline int ocfs2_is_o2cb_active (void ) -{ -return !strcmp (active_stack->sp_name,OCFS2_STACK_PLUGIN_O2CB ); -} -EXPORT_SYMBOL_GPL (ocfs2_is_o2cb_active); -static struct ocfs2_stack_plugin *ocfs2_stack_lookup (const char *name) {struct ocfs2_stack_plugin *p;
fs/ocfs2/stackglue.h +0 -3
@@ -298,9 +298,6 @@ int ocfs2_plock(struct ocfs2_cluster_connection *conn, u64 ino,int ocfs2_stack_glue_register (struct ocfs2_stack_plugin *plugin);void ocfs2_stack_glue_unregister (struct ocfs2_stack_plugin *plugin); -/* In ocfs2_downconvert_lock(), we need to know which stack we are using */ -int ocfs2_is_o2cb_active (void ); -extern struct kset *ocfs2_kset;#endif /* STACKGLUE_H */
Signature · 1 line
1.8.5.6
Quoted 9 lines · Gang He
This patch is used to get rid of
ocfs2_is_o2cb_active()function, Why? First, we had the similar functions to identify which cluster stack is being used viaosb->osb_cluster_stack. Second, the current implementation ofocfs2_is_o2cb_active()function is not total safe, base on the design of stackglue, we need to getocfs2_stack_locklock before usingocfs2_stackrelated data structures, and thatactive_stackpointer can be NULL in case mount failure.Signed-off-by Gang He <[email protected]>
Thanks,
Joseph
Quoted 51 lines
--- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/stackglue.c | 6 ------ fs/ocfs2/stackglue.h | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-)fs/ocfs2/dlmglue.c +1
-1@@ -3409,7 +3409,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb,* we can recover correctly from node failure. Otherwise, we may get * invalid LVB in LKB, but without DLM_SBF_VALNOTVALID being set. */ -if (!ocfs2_is_o2cb_active () && +if (ocfs2_userspace_stack (osb) && lockres->l_ops->flags &LOCK_TYPE_USES_LVB ) lvb =1 ;fs/ocfs2/stackglue.c +0
-6@@ -48,12 +48,6 @@*/ static struct ocfs2_stack_plugin *active_stack; -inline int ocfs2_is_o2cb_active (void ) -{ -return !strcmp (active_stack->sp_name,OCFS2_STACK_PLUGIN_O2CB ); -} -EXPORT_SYMBOL_GPL (ocfs2_is_o2cb_active); -static struct ocfs2_stack_plugin *ocfs2_stack_lookup (const char *name) {struct ocfs2_stack_plugin *p;fs/ocfs2/stackglue.h +0
-3@@ -298,9 +298,6 @@ int ocfs2_plock(struct ocfs2_cluster_connection *conn, u64 ino,int ocfs2_stack_glue_register (struct ocfs2_stack_plugin *plugin);void ocfs2_stack_glue_unregister (struct ocfs2_stack_plugin *plugin); -/* In ocfs2_downconvert_lock(), we need to know which stack we are using */ -int ocfs2_is_o2cb_active (void ); -extern struct kset *ocfs2_kset;#endif /* STACKGLUE_H */
Quoted 9 lines · Gang He
This patch is used to get rid of
ocfs2_is_o2cb_active()function, Why? First, we had the similar functions to identify which cluster stack is being used viaosb->osb_cluster_stack. Second, the current implementation ofocfs2_is_o2cb_active()function is not total safe, base on the design of stackglue, we need to getocfs2_stack_locklock before usingocfs2_stackrelated data structures, and thatactive_stackpointer can be NULL in case mount failure.Signed-off-by Gang He <[email protected]>
Looks good.
Eric
Quoted 50 lines
--- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/stackglue.c | 6 ------ fs/ocfs2/stackglue.h | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-)fs/ocfs2/dlmglue.c +1
-1@@ -3409,7 +3409,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb,* we can recover correctly from node failure. Otherwise, we may get * invalid LVB in LKB, but without DLM_SBF_VALNOTVALID being set. */ -if (!ocfs2_is_o2cb_active () && +if (ocfs2_userspace_stack (osb) && lockres->l_ops->flags &LOCK_TYPE_USES_LVB ) lvb =1 ;fs/ocfs2/stackglue.c +0
-6@@ -48,12 +48,6 @@*/ static struct ocfs2_stack_plugin *active_stack; -inline int ocfs2_is_o2cb_active (void ) -{ -return !strcmp (active_stack->sp_name,OCFS2_STACK_PLUGIN_O2CB ); -} -EXPORT_SYMBOL_GPL (ocfs2_is_o2cb_active); -static struct ocfs2_stack_plugin *ocfs2_stack_lookup (const char *name) {struct ocfs2_stack_plugin *p;fs/ocfs2/stackglue.h +0
-3@@ -298,9 +298,6 @@ int ocfs2_plock(struct ocfs2_cluster_connection *conn, u64 ino,int ocfs2_stack_glue_register (struct ocfs2_stack_plugin *plugin);void ocfs2_stack_glue_unregister (struct ocfs2_stack_plugin *plugin); -/* In ocfs2_downconvert_lock(), we need to know which stack we are using */ -int ocfs2_is_o2cb_active (void ); -extern struct kset *ocfs2_kset;#endif /* STACKGLUE_H */