Hi Jun, On 2018/4/11 8:43, piaojun wrote: > Hi Changwei, > > This patch had been merged into mainline already. > > Please see patch a43d24cb3b0b.
Oops, I forgot to rebase my tree... :( Thanks for your reminder. Changwei > > thanks, > Jun > > On 2018/4/10 19:49, Changwei Ge wrote: >> Signed-off-by: Changwei Ge <ge.chang...@h3c.com> >> --- >> 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 fd6bbbb..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