Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[GFS2] use pid for plock owner for nfs clients 



The fl_owner is that of lockd when posix locks arrive from nfs
clients, so it can't be used to distinguish between lock holders.
Use fl_pid as owner instead; it's the pid of the process on the
nfs client.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent dbee2199

fs/gfs2/locking/dlm/plock.c

+14 −4
Original line number Diff line number Diff line
@@ -89,15 +89,19 @@ int gdlm_plock(void *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;

	if (fl->fl_lmops && fl->fl_lmops->fl_grant) {

		/* fl_owner is lockd which doesn't distinguish

		   processes on the nfs client */

		op->info.owner	= (__u64) fl->fl_pid;

		xop->callback	= fl->fl_lmops->fl_grant;

		locks_init_lock(&xop->flc);

		locks_copy_lock(&xop->flc, fl);

		xop->fl		= fl;

		xop->file	= file;

	} else

	} else {

		op->info.owner	= (__u64)(long) fl->fl_owner;

		xop->callback	= NULL;

	}



	send_op(op);
@@ -203,6 +207,9 @@ int gdlm_punlock(void *lockspace, struct lm_lockname *name, 
	op->info.number		= name->ln_number;

	op->info.start		= fl->fl_start;

	op->info.end		= fl->fl_end;

	if (fl->fl_lmops && fl->fl_lmops->fl_grant)

		op->info.owner	= (__u64) fl->fl_pid;

	else

		op->info.owner	= (__u64)(long) fl->fl_owner;



	send_op(op);
@@ -242,6 +249,9 @@ int gdlm_plock_get(void *lockspace, struct lm_lockname *name, 
	op->info.number		= name->ln_number;

	op->info.start		= fl->fl_start;

	op->info.end		= fl->fl_end;

	if (fl->fl_lmops && fl->fl_lmops->fl_grant)

		op->info.owner	= (__u64) fl->fl_pid;

	else

		op->info.owner	= (__u64)(long) fl->fl_owner;



	send_op(op);