From 8996c3c83f3e5f9d0bc4bac5c494e8d460f161fa Mon Sep 17 00:00:00 2001 From: David Teigland Date: Fri, 28 Jul 2006 14:00:20 -0500 Subject: [PATCH] --- yaml --- r: 38773 b: refs/heads/master c: de9b75d31e81e87685d8cc70052a003c654f1e8e h: refs/heads/master i: 38771: 52fe1fc08bf87318933524bba610a5ded11bf253 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/locking/dlm/plock.c | 2 ++ trunk/include/linux/lock_dlm_plock.h | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 78010928f0fd..4489d2fb5de2 100644 --- 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 index 6adfb2d4fd8c..e5b11f0688f6 100644 --- 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 index 007b07a178ab..fc3415113973 100644 --- 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