lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 174/211] ocfs2: remove ocfs2_is_o2cb_active()
    Date
    From: Gang He <ghe@suse.com>

    commit a634644751c46238df58bbfe992e30c1668388db upstream.

    Remove ocfs2_is_o2cb_active(). We have similar functions to identify
    which cluster stack is being used via osb->osb_cluster_stack.

    Secondly, the current implementation of ocfs2_is_o2cb_active() is not
    totally safe. Based on the design of stackglue, we need to get
    ocfs2_stack_lock before using ocfs2_stack related data structures, and
    that active_stack pointer can be NULL in the case of mount failure.

    Link: http://lkml.kernel.org/r/1495441079-11708-1-git-send-email-ghe@suse.com
    Signed-off-by: Gang He <ghe@suse.com>
    Reviewed-by: Joseph Qi <jiangqi903@gmail.com>
    Reviewed-by: Eric Ren <zren@suse.com>
    Acked-by: Changwei Ge <ge.changwei@h3c.com>
    Cc: Mark Fasheh <mark@fasheh.com>
    Cc: Joel Becker <jlbec@evilplan.org>
    Cc: Junxiao Bi <junxiao.bi@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ocfs2/dlmglue.c | 2 +-
    fs/ocfs2/stackglue.c | 6 ------
    fs/ocfs2/stackglue.h | 3 ---
    3 files changed, 1 insertion(+), 10 deletions(-)

    --- a/fs/ocfs2/dlmglue.c
    +++ b/fs/ocfs2/dlmglue.c
    @@ -3422,7 +3422,7 @@ static int ocfs2_downconvert_lock(struct
    * 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;

    --- a/fs/ocfs2/stackglue.c
    +++ b/fs/ocfs2/stackglue.c
    @@ -48,12 +48,6 @@ static char ocfs2_hb_ctl_path[OCFS2_MAX_
    */
    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;
    --- a/fs/ocfs2/stackglue.h
    +++ b/fs/ocfs2/stackglue.h
    @@ -298,9 +298,6 @@ void ocfs2_stack_glue_set_max_proto_vers
    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 */

    \
     
     \ /
      Last update: 2019-11-27 22:33    [W:3.697 / U:0.920 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site