The patch titled
Subject: fs: ocfs: remove unnecessary assertion in dlm_migrate_lockres
has been added to the -mm tree. Its filename is
fs-ocfs-remove-unnecessary-assertion-in-dlm_migrate_lockres.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/fs-ocfs-remove-unnecessary-assertion-in-dlm_migrate_lockres.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/fs-ocfs-remove-unnecessary-assertion-in-dlm_migrate_lockres.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Aditya Pakki <pakki001@xxxxxxx>
Subject: fs: ocfs: remove unnecessary assertion in dlm_migrate_lockres
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@xxxxxxx
Signed-off-by: Aditya Pakki <pakki001@xxxxxxx>
Cc: Mark Fasheh <mark@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Joseph Qi <jiangqi903@xxxxxxxxx>
Cc: Changwei Ge <gechangwei@xxxxxxx>
Cc: Gang He <ghe@xxxxxxxx>
Cc: Jun Piao <piaojun@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dlm/dlmmaster.c | 2 --
1 file changed, 2 deletions(-)
--- a/fs/ocfs2/dlm/dlmmaster.c~fs-ocfs-remove-unnecessary-assertion-in-dlm_migrate_lockres
+++ a/fs/ocfs2/dlm/dlmmaster.c
@@ -2554,8 +2554,6 @@ static int dlm_migrate_lockres(struct dl
if (!dlm_grab(dlm))
return -EINVAL;
- BUG_ON(target == O2NM_MAX_NODES);
-
name = res->lockname.name;
namelen = res->lockname.len;
_
Patches currently in -mm which might be from pakki001@xxxxxxx are
fs-ocfs-remove-unnecessary-assertion-in-dlm_migrate_lockres.patch
