aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/locking/dlm/plock.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-04-25 15:45:51 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-04-25 15:45:51 -0400
commit3a2a9c96ac129d17aad1a5c46988ad28f72564b0 (patch)
tree5cc5be39b85f1caebb25043781f331fcf1d2a119 /fs/gfs2/locking/dlm/plock.c
parent373b5a453255b6a013b9d20116918f09a1ceeccc (diff)
[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/dlm/plock.c')
-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,
70 return -ENOMEM; 70 return -ENOMEM;
71 71
72 op->info.optype = GDLM_PLOCK_OP_LOCK; 72 op->info.optype = GDLM_PLOCK_OP_LOCK;
73 op->info.pid = (uint32_t) fl->fl_owner; 73 op->info.pid = fl->fl_pid;
74 op->info.ex = (fl->fl_type == F_WRLCK); 74 op->info.ex = (fl->fl_type == F_WRLCK);
75 op->info.wait = IS_SETLKW(cmd); 75 op->info.wait = IS_SETLKW(cmd);
76 op->info.fsid = ls->id; 76 op->info.fsid = ls->id;
@@ -116,7 +116,7 @@ int gdlm_punlock(lm_lockspace_t *lockspace, struct lm_lockname *name,
116 name->ln_type, name->ln_number); 116 name->ln_type, name->ln_number);
117 117
118 op->info.optype = GDLM_PLOCK_OP_UNLOCK; 118 op->info.optype = GDLM_PLOCK_OP_UNLOCK;
119 op->info.pid = (uint32_t) fl->fl_owner; 119 op->info.pid = fl->fl_pid;
120 op->info.fsid = ls->id; 120 op->info.fsid = ls->id;
121 op->info.number = name->ln_number; 121 op->info.number = name->ln_number;
122 op->info.start = fl->fl_start; 122 op->info.start = fl->fl_start;
@@ -150,7 +150,7 @@ int gdlm_plock_get(lm_lockspace_t *lockspace, struct lm_lockname *name,
150 return -ENOMEM; 150 return -ENOMEM;
151 151
152 op->info.optype = GDLM_PLOCK_OP_GET; 152 op->info.optype = GDLM_PLOCK_OP_GET;
153 op->info.pid = (uint32_t) fl->fl_owner; 153 op->info.pid = fl->fl_pid;
154 op->info.ex = (fl->fl_type == F_WRLCK); 154 op->info.ex = (fl->fl_type == F_WRLCK);
155 op->info.fsid = ls->id; 155 op->info.fsid = ls->id;
156 op->info.number = name->ln_number; 156 op->info.number = name->ln_number;