The patch titled
dlm: clear NEW_MASTER flag
has been removed from the -mm tree. Its filename is
dlm-recovery-clear-new_master-flag.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: David Teigland <teigland@xxxxxxxxxx>
If recover_locks() on an rsb doesn't find any locks to recover, we need to
clear the NEW_MASTER flag since it won't be cleared by dlm_recovered_lock().
Signed-off-by: David Teigland <teigland@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
Cc: Steven Whitehouse <swhiteho@xxxxxxxxxx>
---
drivers/dlm/recover.c | 4 ++++
1 files changed, 4 insertions(+)
diff -puN drivers/dlm/recover.c~dlm-recovery-clear-new_master-flag drivers/dlm/recover.c
--- devel/drivers/dlm/recover.c~dlm-recovery-clear-new_master-flag 2006-02-21 13:35:23.000000000 -0800
+++ devel-akpm/drivers/dlm/recover.c 2006-02-21 13:35:23.000000000 -0800
@@ -472,6 +472,8 @@ static int recover_locks(struct dlm_rsb
if (r->res_recover_locks_count)
recover_list_add(r);
+ else
+ rsb_clear_flag(r, RSB_NEW_MASTER);
out:
unlock_rsb(r);
return error;
@@ -523,6 +525,8 @@ int dlm_recover_locks(struct dlm_ls *ls)
void dlm_recovered_lock(struct dlm_rsb *r)
{
+ DLM_ASSERT(rsb_flag(r, RSB_NEW_MASTER), dlm_print_rsb(r););
+
r->res_recover_locks_count--;
if (!r->res_recover_locks_count) {
clear_bit(RESFL_NEW_MASTER, &r->res_flags);
_
Patches currently in -mm which might be from teigland@xxxxxxxxxx are
git-gfs2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
