aboutsummaryrefslogtreecommitdiff
path: root/fs/dlm/lock.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2008-02-21 11:25:42 -0600
committerDavid Teigland <teigland@redhat.com>2008-04-21 11:18:01 -0500
commit761b9d3ffc953c24ceb55d8e12ff7e02b17e0484 (patch)
tree07dcab128761847c008b589bf367715f2fcd60b0 /fs/dlm/lock.c
parent170e19ab2900b7c959d7a0e627fd12f383efcfa1 (diff)
downloadlinux-linaro-stable-761b9d3ffc953c24ceb55d8e12ff7e02b17e0484.tar.gz
dlm: save master info after failed no-queue request
When a NOQUEUE request fails, the rsb res_master field is unnecessarily reset to -1, instead of leaving the valid master setting in place. We want to save the looked-up master values while the rsb is on the "toss list" so that another lookup can be avoided if the rsb is soon reused. The fix is to simply leave res_master value alone. Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/lock.c')
-rw-r--r--fs/dlm/lock.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 1e9e8ebee251..2d3d1027ce2b 100644
--- a/fs/dlm/lock.c
+++ b/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: