Re: AFS compile broken

[Cornelia Huck <cornelia.huck@de.ibm.com>]

On Thu, 19 Jul 2007 15:19:40 +0300 (EEST),
Meelis Roos <mroos@linux.ee> wrote:

> Trying to compile todays git with modular AFS and gcc 4.1.3 prerelease 
> in Debian unstable (gcc version 4.1.3 20070629 (prerelease) (Debian 
> 4.1.2-13)):
> 
>   CC [M]  fs/afs/flock.o
> fs/afs/flock.c: In function 'afs_do_getlk':
> fs/afs/flock.c:459: error: void value not ignored as it ought to be
> make[3]: *** [fs/afs/flock.o] Error 1

Should probably be something like this, but I have no idea whether this
is correct. David?

---
 fs/afs/flock.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- linux-2.6.22.orig/fs/afs/flock.c
+++ linux-2.6.22/fs/afs/flock.c
@@ -456,7 +456,8 @@ static int afs_do_getlk(struct file *fil
 
 	/* check local lock records first */
 	ret = 0;
-	if (posix_test_lock(file, fl) == 0) {
+	posix_test_lock(file, fl);
+	if (fl->fl_type == F_UNLCK) {
 		/* no local locks; consult the server */
 		ret = afs_vnode_fetch_status(vnode, NULL, key);
 		if (ret < 0)