[GFS2] add plock owner

We need to use fl_owner instead of fl_pid to track the owner of a posix
lock.  Pass the owner value out to user space where cluster plocks are
managed.

Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
index 6adfb2d4fd8c5e966fa5c0933ae8a17b7e96f7ef..e5b11f0688f6dbc8e390f8dfee84819405c8119d 100644 (file)
--- a/fs/gfs2/locking/dlm/plock.c
+++ b/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/include/linux/lock_dlm_plock.h b/include/linux/lock_dlm_plock.h
index 007b07a178abacd3de90515f91b541c6282da71a..fc34151139738f593032afed0fc27ca09b3605c3 100644 (file)
--- a/include/linux/lock_dlm_plock.h
+++ b/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