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

Commit 24179f48 authored by David Teigland's avatar David Teigland
Browse files

dlm: fix plock notify callback to lockd



We should use the original copy of the file_lock, fl, instead
of the copy, flc in the lockd notify callback.  The range in flc has
been modified by posix_lock_file(), so it will not match a copy of the
lock in lockd.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent f3b8436a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int dlm_plock_callback(struct plock_op *op)
	notify = xop->callback;

	if (op->info.rv) {
		notify(flc, NULL, op->info.rv);
		notify(fl, NULL, op->info.rv);
		goto out;
	}

@@ -187,7 +187,7 @@ static int dlm_plock_callback(struct plock_op *op)
			  (unsigned long long)op->info.number, file, fl);
	}

	rv = notify(flc, NULL, 0);
	rv = notify(fl, NULL, 0);
	if (rv) {
		/* XXX: We need to cancel the fs lock here: */
		log_print("dlm_plock_callback: lock granted after lock request "