public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
	Andrew Morton <akpm@linux-foundation.org>,
	David Howells <dhowells@redhat.com>
Subject: [patch] afs: build fix
Date: Thu, 19 Jul 2007 18:56:46 +0200	[thread overview]
Message-ID: <20070719165646.GA18436@elte.hu> (raw)

Subject: afs: build fix
From: Ingo Molnar <mingo@elte.hu>

this fresh commit:

 commit e8d6c554126b830217c5e9f549e0e21f865a0a8a
 Author: David Howells <dhowells@redhat.com>
 Date:   Sun Jul 15 23:40:12 2007 -0700

     AFS: implement file locking

     Implement file locking for AFS.

did not even build (in an allyesconfig) because it forgot to take this
recent commit into account:

 commit 6d34ac199a4af5c678a3a8f3275aeb2586b72da3
 Author: J. Bruce Fields <bfields@citi.umich.edu>
 Date:   Fri May 11 16:09:32 2007 -0400

     locks: make posix_test_lock() interface more consistent

the fix is trivial.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 fs/afs/flock.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux/fs/afs/flock.c
===================================================================
--- linux.orig/fs/afs/flock.c
+++ linux/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)

             reply	other threads:[~2007-07-19 16:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-19 16:56 Ingo Molnar [this message]
2007-07-19 17:04 ` [patch] afs: build fix David Howells

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070719165646.GA18436@elte.hu \
    --to=mingo@elte.hu \
    --cc=akpm@linux-foundation.org \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox