Commit de9b75d3 authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[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: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 420b9e5e

fs/gfs2/locking/dlm/plock.c

+2 −0
Original line number Diff line number Diff line
@@ -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));

include/linux/lock_dlm_plock.h

+2 −1
Original line number Diff line number Diff line
@@ -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