diff options
| author | David Teigland <teigland@redhat.com> | 2006-04-25 15:45:51 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-25 15:45:51 -0400 |
| commit | 3a2a9c96ac129d17aad1a5c46988ad28f72564b0 (patch) | |
| tree | 5cc5be39b85f1caebb25043781f331fcf1d2a119 /fs/gfs2/locking | |
| parent | 373b5a453255b6a013b9d20116918f09a1ceeccc (diff) | |
| download | op-kernel-dev-3a2a9c96ac129d17aad1a5c46988ad28f72564b0.zip op-kernel-dev-3a2a9c96ac129d17aad1a5c46988ad28f72564b0.tar.gz | |
[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>
Diffstat (limited to 'fs/gfs2/locking')
| -rw-r--r-- | fs/gfs2/locking/dlm/plock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c index f7ac582..86312d9 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; |
