Re: [Ocfs2-devel] [PATCH 2/2] ocfs2/dlm: clean up unused stack variable in dlm_do_local_ast()

[piaojun]

On 2018/3/15 20:24, Changwei Ge wrote:
> Signed-off-by: Changwei Ge 
Acked-by: Jun Piao 
> ---
>  fs/ocfs2/dlm/dlmast.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c
> index fd6..39831fc 100644
> --- a/fs/ocfs2/dlm/dlmast.c
> +++ b/fs/ocfs2/dlm/dlmast.c
> @@ -224,14 +224,12 @@ void dlm_do_local_ast(struct dlm_ctxt *dlm, struct 
> dlm_lock_resource *res,
> struct dlm_lock *lock)
>  {
>   dlm_astlockfunc_t *fn;
> - struct dlm_lockstatus *lksb;
>  
>   mlog(0, "%s: res %.*s, lock %u:%llu, Local AST\n", dlm->name,
>res->lockname.len, res->lockname.name,
>dlm_get_lock_cookie_node(be64_to_cpu(lock->ml.cookie)),
>dlm_get_lock_cookie_seq(be64_to_cpu(lock->ml.cookie)));
>  
> - lksb = lock->lksb;
>   fn = lock->ast;
>   BUG_ON(lock->ml.node != dlm->node_num);
>  
> 

___
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

Re: [Ocfs2-devel] [PATCH 1/2] ocfs2/dlm: clean up unused argument for dlm_destroy_recovery_area()

[piaojun]

On 2018/3/15 20:24, Changwei Ge wrote:
> Signed-off-by: Changwei Ge 
Acked-by: Jun Piao 
> ---
>  fs/ocfs2/dlm/dlmrecovery.c | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
> index ec8f758..b36808c 100644
> --- a/fs/ocfs2/dlm/dlmrecovery.c
> +++ b/fs/ocfs2/dlm/dlmrecovery.c
> @@ -62,7 +62,7 @@ static int dlm_remaster_locks(struct dlm_ctxt *dlm, u8 
> dead_node);
>  static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 dead_node);
>  static int dlm_request_all_locks(struct dlm_ctxt *dlm,
>u8 request_from, u8 dead_node);
> -static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm, u8 dead_node);
> +static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm);
>  
>  static inline int dlm_num_locks_in_lockres(struct dlm_lock_resource *res);
>  static void dlm_init_migratable_lockres(struct dlm_migratable_lockres *mres,
> @@ -739,7 +739,7 @@ static int dlm_remaster_locks(struct dlm_ctxt *dlm, u8 
> dead_node)
>   }
>  
>   if (destroy)
> - dlm_destroy_recovery_area(dlm, dead_node);
> + dlm_destroy_recovery_area(dlm);
>  
>   return status;
>  }
> @@ -764,7 +764,7 @@ static int dlm_init_recovery_area(struct dlm_ctxt *dlm, 
> u8 dead_node)
>  
>   ndata = kzalloc(sizeof(*ndata), GFP_NOFS);
>   if (!ndata) {
> - dlm_destroy_recovery_area(dlm, dead_node);
> + dlm_destroy_recovery_area(dlm);
>   return -ENOMEM;
>   }
>   ndata->node_num = num;
> @@ -778,7 +778,7 @@ static int dlm_init_recovery_area(struct dlm_ctxt *dlm, 
> u8 dead_node)
>   return 0;
>  }
>  
> -static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm, u8 dead_node)
> +static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm)
>  {
>   struct dlm_reco_node_data *ndata, *next;
>   LIST_HEAD(tmplist);
> 

___
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

[Ocfs2-devel] [PATCH] ocfs2/dlm: wait for dlm recovery done when migrating all lock resources

[piaojun]

Wait for dlm recovery done when migrating all lock resources in case that
new lock resource left after leaving dlm domain. And the left lock
resource will cause other nodes BUG.

  NodeA   NodeBNodeC

umount:
  dlm_unregister_domain()
dlm_migrate_all_locks()

 NodeB down

do recovery for NodeB
and collect a new lockres
form other live nodes:

  dlm_do_recovery
dlm_remaster_locks
  dlm_request_all_locks:

  dlm_mig_lockres_handler
dlm_new_lockres
  __dlm_insert_lockres

at last NodeA become the
master of the new lockres
and leave domain:
  dlm_leave_domain()

  mount:
dlm_join_domain()

  touch file and request
  for the owner of the new
  lockres, but all the
  other nodes said 'NO',
  so NodeC decide to be
  the owner, and send do
  assert msg to other
  nodes:
  dlmlock()
dlm_get_lock_resource()
  dlm_do_assert_master()

  other nodes receive the msg
  and found two masters exist.
  at last cause BUG in
  dlm_assert_master_handler()
  -->BUG();

Fixes: bc9838c4d44a ("dlm: allow dlm do recovery during shutdown")

Signed-off-by: Jun Piao 
Reviewed-by: Alex Chen 
Reviewed-by: Yiwen Jiang 
---
 fs/ocfs2/dlm/dlmcommon.h   |  1 +
 fs/ocfs2/dlm/dlmdomain.c   | 15 +++
 fs/ocfs2/dlm/dlmrecovery.c | 13 ++---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index 953c200..d06e27e 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -140,6 +140,7 @@ struct dlm_ctxt
u8 node_num;
u32 key;
u8  joining_node;
+   u8 migrate_done; /* set to 1 means node has migrated all lock resources 
*/
wait_queue_head_t dlm_join_events;
unsigned long live_nodes_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
unsigned long domain_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 25b76f0..425081b 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -461,6 +461,19 @@ static int dlm_migrate_all_locks(struct dlm_ctxt *dlm)
cond_resched_lock(>spinlock);
num += n;
}
+
+   if (!num) {
+   if (dlm->reco.state & DLM_RECO_STATE_ACTIVE) {
+   mlog(0, "%s: perhaps there are more lock resources "
+"need to be migrated after dlm recovery\n", 
dlm->name);
+   ret = -EAGAIN;
+   } else {
+   mlog(0, "%s: we won't do dlm recovery after migrating "
+"all lock resources\n", dlm->name);
+   dlm->migrate_done = 1;
+   }
+   }
+
spin_unlock(>spinlock);
wake_up(>dlm_thread_wq);

@@ -2038,6 +2051,8 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
dlm->joining_node = DLM_LOCK_RES_OWNER_UNKNOWN;
init_waitqueue_head(>dlm_join_events);

+   dlm->migrate_done = 0;
+
dlm->reco.new_master = O2NM_INVALID_NODE_NUM;
dlm->reco.dead_node = O2NM_INVALID_NODE_NUM;

diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 505ab42..d4336a5 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -423,12 +423,11 @@ void dlm_wait_for_recovery(struct dlm_ctxt *dlm)

 static void dlm_begin_recovery(struct dlm_ctxt *dlm)
 {
-   spin_lock(>spinlock);
+   assert_spin_locked(>spinlock);
BUG_ON(dlm->reco.state & DLM_RECO_STATE_ACTIVE);
printk(KERN_NOTICE "o2dlm: Begin recovery on domain %s for node %u\n",
   dlm->name, dlm->reco.dead_node);
dlm->reco.state |= DLM_RECO_STATE_ACTIVE;
-   spin_unlock(>spinlock);
 }

 static void dlm_end_recovery(struct dlm_ctxt *dlm)
@@ -456,6 +455,13 @@ static int dlm_do_recovery(struct dlm_ctxt *dlm)

spin_lock(>spinlock);

+   if (dlm->migrate_done) {
+   mlog(0, "%s: no need do recovery after migrating all "
+

[Ocfs2-devel] [PATCH 1/2] ocfs2/dlm: clean up unused argument for dlm_destroy_recovery_area()

[Changwei Ge]

Signed-off-by: Changwei Ge 
---
 fs/ocfs2/dlm/dlmrecovery.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index ec8f758..b36808c 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -62,7 +62,7 @@ static int dlm_remaster_locks(struct dlm_ctxt *dlm, u8 
dead_node);
 static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 dead_node);
 static int dlm_request_all_locks(struct dlm_ctxt *dlm,
 u8 request_from, u8 dead_node);
-static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm, u8 dead_node);
+static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm);
 
 static inline int dlm_num_locks_in_lockres(struct dlm_lock_resource *res);
 static void dlm_init_migratable_lockres(struct dlm_migratable_lockres *mres,
@@ -739,7 +739,7 @@ static int dlm_remaster_locks(struct dlm_ctxt *dlm, u8 
dead_node)
}
 
if (destroy)
-   dlm_destroy_recovery_area(dlm, dead_node);
+   dlm_destroy_recovery_area(dlm);
 
return status;
 }
@@ -764,7 +764,7 @@ static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 
dead_node)
 
ndata = kzalloc(sizeof(*ndata), GFP_NOFS);
if (!ndata) {
-   dlm_destroy_recovery_area(dlm, dead_node);
+   dlm_destroy_recovery_area(dlm);
return -ENOMEM;
}
ndata->node_num = num;
@@ -778,7 +778,7 @@ static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 
dead_node)
return 0;
 }
 
-static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm, u8 dead_node)
+static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm)
 {
struct dlm_reco_node_data *ndata, *next;
LIST_HEAD(tmplist);
-- 
2.7.4


___
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

[Ocfs2-devel] [PATCH 2/2] ocfs2/dlm: clean up unused stack variable in dlm_do_local_ast()

[Changwei Ge]

Signed-off-by: Changwei Ge 
---
 fs/ocfs2/dlm/dlmast.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c
index fd6..39831fc 100644
--- a/fs/ocfs2/dlm/dlmast.c
+++ b/fs/ocfs2/dlm/dlmast.c
@@ -224,14 +224,12 @@ void dlm_do_local_ast(struct dlm_ctxt *dlm, struct 
dlm_lock_resource *res,
  struct dlm_lock *lock)
 {
dlm_astlockfunc_t *fn;
-   struct dlm_lockstatus *lksb;
 
mlog(0, "%s: res %.*s, lock %u:%llu, Local AST\n", dlm->name,
 res->lockname.len, res->lockname.name,
 dlm_get_lock_cookie_node(be64_to_cpu(lock->ml.cookie)),
 dlm_get_lock_cookie_seq(be64_to_cpu(lock->ml.cookie)));
 
-   lksb = lock->lksb;
fn = lock->ast;
BUG_ON(lock->ml.node != dlm->node_num);
 
-- 
2.7.4


___
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel