Commit a90e8a75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: initialize file_lock struct in GETLK before copying conflicting lock
  dlm: fix plock notify callback to lockd
parents cc597bc3 20d5a399

fs/dlm/plock.c

+4 −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 "
@@ -304,7 +304,9 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file, 
	if (rv == -ENOENT)

		rv = 0;

	else if (rv > 0) {

		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_start = op->info.start;

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