]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fs: ocfs: remove unnecessary assertion in dlm_migrate_lockres
authorAditya Pakki <pakki001@umn.edu>
Fri, 31 Jan 2020 06:11:33 +0000 (22:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jan 2020 18:30:36 +0000 (10:30 -0800)
In the only caller of dlm_migrate_lockres() - dlm_empty_lockres(),
target is checked for O2NM_MAX_NODES.  Thus, the assertion in
dlm_migrate_lockres() is unnecessary and can be removed.  The patch
eliminates such a check.

Link: http://lkml.kernel.org/r/20191218194111.26041-1-pakki001@umn.edu
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <jiangqi903@gmail.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/dlm/dlmmaster.c

index 74b768ca1cd8823e6d22456b76803dcbe32b72cb..3b239637f884e5857fcb9348f41d6a8587edc2d4 100644 (file)
@@ -2554,8 +2554,6 @@ static int dlm_migrate_lockres(struct dlm_ctxt *dlm,
        if (!dlm_grab(dlm))
                return -EINVAL;
 
-       BUG_ON(target == O2NM_MAX_NODES);
-
        name = res->lockname.name;
        namelen = res->lockname.len;