---

yaml --- r: 38773 b: refs/heads/master c: de9b75d h: refs/heads/master i: 38771: 52fe1fc v: v3
git-mirror · Jul 31, 2006 · 8996c3c · 8996c3c
1 parent 4da9877
commit 8996c3c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 420b9e5e45d33355471c8d2d593bb0e5d6c77421
+refs/heads/master: de9b75d31e81e87685d8cc70052a003c654f1e8e
diff --git a/trunk/fs/gfs2/locking/dlm/plock.c b/trunk/fs/gfs2/locking/dlm/plock.c
@@ -77,6 +77,7 @@ int gdlm_plock(lm_lockspace_t *lockspace, struct lm_lockname *name,
 	op->info.number		= name->ln_number;
 	op->info.start		= fl->fl_start;
 	op->info.end		= fl->fl_end;
+	op->info.owner		= (__u64)(long) fl->fl_owner;
 
 	send_op(op);
 	wait_event(recv_wq, (op->done != 0));
@@ -122,6 +123,7 @@ int gdlm_punlock(lm_lockspace_t *lockspace, struct lm_lockname *name,
 	op->info.number		= name->ln_number;
 	op->info.start		= fl->fl_start;
 	op->info.end		= fl->fl_end;
+	op->info.owner		= (__u64)(long) fl->fl_owner;
 
 	send_op(op);
 	wait_event(recv_wq, (op->done != 0));

diff --git a/trunk/include/linux/lock_dlm_plock.h b/trunk/include/linux/lock_dlm_plock.h
@@ -12,7 +12,7 @@
 #define GDLM_PLOCK_MISC_NAME		"lock_dlm_plock"
 
 #define GDLM_PLOCK_VERSION_MAJOR	1
-#define GDLM_PLOCK_VERSION_MINOR	0
+#define GDLM_PLOCK_VERSION_MINOR	1
 #define GDLM_PLOCK_VERSION_PATCH	0
 
 enum {
@@ -34,6 +34,7 @@ struct gdlm_plock_info {
 	__u64 number;
 	__u64 start;
 	__u64 end;
+	__u64 owner;
 };
 
 #endif