Commit 3134cbec authored Jun 09, 2006 by Marc Eshel Committed by Trond Myklebust Jun 09, 2006

locks.c: add the fl_owner to nlm_compare_locks



Add the fl_owner to NLM compare locks. Since two different client can
present the same pid to the server it is not enough to distinguish locks
from different clients. The fl_owner field is a pointer to the struct
nlm_host which is unique for each client.

Signed-off-by: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent 81039f1f

include/linux/lockd/lockd.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -220,6 +220,7 @@ static __inline__ int
		nlm_compare_locks(const struct file_lock fl1, const struct file_lock fl2)
		{
		return fl1->fl_pid == fl2->fl_pid
		&& fl1->fl_owner == fl2->fl_owner
		&& fl1->fl_start == fl2->fl_start
		&& fl1->fl_end == fl2->fl_end
		&&(fl1->fl_type == fl2->fl_type \|\| fl2->fl_type == F_UNLCK);