diff --git a/[refs] b/[refs] index 6010206a8868..27dcdb7eb16b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 170e19ab2900b7c959d7a0e627fd12f383efcfa1 +refs/heads/master: 761b9d3ffc953c24ceb55d8e12ff7e02b17e0484 diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c index 1e9e8ebee251..2d3d1027ce2b 100644 --- a/trunk/fs/dlm/lock.c +++ b/trunk/fs/dlm/lock.c @@ -1956,8 +1956,7 @@ static void confirm_master(struct dlm_rsb *r, int error) list_del_init(&lkb->lkb_rsb_lookup); r->res_first_lkid = lkb->lkb_id; _request_lock(r, lkb); - } else - r->res_nodeid = -1; + } break; default: