diff --git a/[refs] b/[refs]
index 90b948ed65b4..f585c6bd9d60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 373b5a453255b6a013b9d20116918f09a1ceeccc
+refs/heads/master: 3a2a9c96ac129d17aad1a5c46988ad28f72564b0
diff --git a/trunk/fs/gfs2/locking/dlm/plock.c b/trunk/fs/gfs2/locking/dlm/plock.c
index f7ac5821def9..86312d96147b 100644
--- a/trunk/fs/gfs2/locking/dlm/plock.c
+++ b/trunk/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;