summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-04-25 21:45:51 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2006-04-25 21:45:51 +0200
commit3a2a9c96ac129d17aad1a5c46988ad28f72564b0 (patch)
tree5cc5be39b85f1caebb25043781f331fcf1d2a119
parent[GFS2] Update documentation (diff)
downloadlinux-3a2a9c96ac129d17aad1a5c46988ad28f72564b0.tar.xz
linux-3a2a9c96ac129d17aad1a5c46988ad28f72564b0.zip
[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>
-rw-r--r--fs/gfs2/locking/dlm/plock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
index f7ac5821def9..86312d96147b 100644
--- a/fs/gfs2/locking/dlm/plock.c
+++ b/fs/gfs2/locking/dlm/plock.c
@@ -70,7 +70,7 @@ int gdlm_plock(lm_lockspace_t *lockspace, struct lm_lockname *name,
return -ENOMEM;
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.wait = IS_SETLKW(cmd);
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);
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.number = name->ln_number;
op->info.start = fl->fl_start;
@@ -150,7 +150,7 @@ int gdlm_plock_get(lm_lockspace_t *lockspace, struct lm_lockname *name,
return -ENOMEM;
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.fsid = ls->id;
op->info.number = name->ln_number;