From: David Teigland <teigland@redhat.com>
Date: Fri, 8 Jun 2007 22:01:40 +0000 (-0500)
Subject: [GFS2] return conflicts for GETLK
X-Git-Tag: v2.6.23-rc1~1156^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7a2ff8a951ab373732116e7c31e2e1fe025d5e0;p=pandora-kernel.git

[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: Steven Whitehouse <swhiteho@redhat.com>
---

Reading git-diff-tree failed