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

Commit f8694270 authored by Alexander Aring's avatar Alexander Aring Committed by Greg Kroah-Hartman
Browse files

fs: dlm: return positive pid value for F_GETLK 



commit 92655fbda5c05950a411eaabc19e025e86e2a291 upstream.

The GETLK pid values have all been negated since commit 9d5b86ac
("fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks").
Revert this for local pids, and leave in place negative pids for remote
owners.

Cc: stable@vger.kernel.org
Fixes: 9d5b86ac ("fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks")
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ecfd1f82

fs/dlm/plock.c

+3 −1
Original line number Diff line number Diff line
@@ -363,7 +363,9 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file, 
		locks_init_lock(fl);

		fl->fl_type = (op->info.ex) ? F_WRLCK : F_RDLCK;

		fl->fl_flags = FL_POSIX;

		fl->fl_pid = -op->info.pid;

		fl->fl_pid = op->info.pid;

		if (op->info.nodeid != dlm_our_nodeid())

			fl->fl_pid = -fl->fl_pid;

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

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

		rv = 0;