mirror of https://gitee.com/openkylin/linux.git
[GFS2] Update plock code in DLM locking module
We should be using fl_pid not fl_owner. Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
373b5a4532
commit
3a2a9c96ac
|
@ -70,7 +70,7 @@ int gdlm_plock(lm_lockspace_t *lockspace, struct lm_lockname *name,
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
op->info.optype = GDLM_PLOCK_OP_LOCK;
|
op->info.optype = GDLM_PLOCK_OP_LOCK;
|
||||||
op->info.pid = (uint32_t) fl->fl_owner;
|
op->info.pid = fl->fl_pid;
|
||||||
op->info.ex = (fl->fl_type == F_WRLCK);
|
op->info.ex = (fl->fl_type == F_WRLCK);
|
||||||
op->info.wait = IS_SETLKW(cmd);
|
op->info.wait = IS_SETLKW(cmd);
|
||||||
op->info.fsid = ls->id;
|
op->info.fsid = ls->id;
|
||||||
|
@ -116,7 +116,7 @@ int gdlm_punlock(lm_lockspace_t *lockspace, struct lm_lockname *name,
|
||||||
name->ln_type, name->ln_number);
|
name->ln_type, name->ln_number);
|
||||||
|
|
||||||
op->info.optype = GDLM_PLOCK_OP_UNLOCK;
|
op->info.optype = GDLM_PLOCK_OP_UNLOCK;
|
||||||
op->info.pid = (uint32_t) fl->fl_owner;
|
op->info.pid = fl->fl_pid;
|
||||||
op->info.fsid = ls->id;
|
op->info.fsid = ls->id;
|
||||||
op->info.number = name->ln_number;
|
op->info.number = name->ln_number;
|
||||||
op->info.start = fl->fl_start;
|
op->info.start = fl->fl_start;
|
||||||
|
@ -150,7 +150,7 @@ int gdlm_plock_get(lm_lockspace_t *lockspace, struct lm_lockname *name,
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
op->info.optype = GDLM_PLOCK_OP_GET;
|
op->info.optype = GDLM_PLOCK_OP_GET;
|
||||||
op->info.pid = (uint32_t) fl->fl_owner;
|
op->info.pid = fl->fl_pid;
|
||||||
op->info.ex = (fl->fl_type == F_WRLCK);
|
op->info.ex = (fl->fl_type == F_WRLCK);
|
||||||
op->info.fsid = ls->id;
|
op->info.fsid = ls->id;
|
||||||
op->info.number = name->ln_number;
|
op->info.number = name->ln_number;
|
||||||
|
|
Loading…
Reference in New Issue