linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
	linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: file locking fix for 3.2
Date: Mon, 26 Dec 2011 15:18:12 -0500	[thread overview]
Message-ID: <20111226201812.GB31492@fieldses.org> (raw)
In-Reply-To: <alpine.LFD.2.02.1112261035240.27600@i5.linux-foundation.org>

On Mon, Dec 26, 2011 at 10:37:56AM -0800, Linus Torvalds wrote:
> 
> I'm committing the appended version instead. It removes all the games with 
> IS_ERR(), and just does the checking at the allocation point, the way the 
> other lease_alloc() user does too.
> 
> Holler if you see something odd in there..

Looks fine to me.

> @@ -1284,8 +1280,7 @@ restart:
>  
>  out:
>  	unlock_flocks();
> -	if (!IS_ERR(new_fl))
> -		locks_free_lock(new_fl);
> +	locks_free_lock(new_fl);
>  	return error;
>  }
>  

(And, oops, I missed that last check--thanks for catching it.)

--b.

      reply	other threads:[~2011-12-26 20:18 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-24 21:50 file locking fix for 3.2 J. Bruce Fields
2011-12-24 22:55 ` Al Viro
2011-12-24 23:50   ` J. Bruce Fields
2011-12-25  0:05     ` Al Viro
2011-12-25 18:19       ` J. Bruce Fields
2011-12-26 18:37         ` Linus Torvalds
2011-12-26 20:18           ` J. Bruce Fields [this message]

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=20111226201812.GB31492@fieldses.org \
    --to=bfields@fieldses.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=viro@zeniv.linux.org.uk \
    /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;
as well as URLs for NNTP newsgroup(s).