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

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

[GFS2] return conflicts for GETLK 



We weren't returning the correct result when GETLK found a conflict,
which is indicated by userspace passing back a 1.

Signed-off-by: Abhijith Das <adas redhat com>
Signed-off-by: David Teigland <teigland redhat com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent d88101d4

fs/gfs2/locking/dlm/plock.c

+5 −1
Original line number Diff line number Diff line
@@ -254,16 +254,20 @@ int gdlm_plock_get(void *lockspace, struct lm_lockname *name, 
	}

	spin_unlock(&ops_lock);



	/* info.rv from userspace is 1 for conflict, 0 for no-conflict,

	   -ENOENT if there are no locks on the file */



	rv = op->info.rv;



	fl->fl_type = F_UNLCK;

	if (rv == -ENOENT)

		rv = 0;

	else if (rv == 0 && op->info.pid != fl->fl_pid) {

	else if (rv > 0) {

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

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

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

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

		rv = 0;

	}



	kfree(op);