From owner-cvs-all@FreeBSD.ORG  Tue May 27 00:20:20 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 881FC106566B;
	Tue, 27 May 2008 00:20:20 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 59C038FC16;
	Tue, 27 May 2008 00:20:20 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4R0KKdP010158;
	Tue, 27 May 2008 00:20:20 GMT
	(envelope-from attilio@repoman.freebsd.org)
Received: (from attilio@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4R0KKrQ010157;
	Tue, 27 May 2008 00:20:20 GMT (envelope-from attilio)
Message-Id: <200805270020.m4R0KKrQ010157@repoman.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 27 May 2008 00:20:20 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/nfs4client nfs4_vnops.c src/sys/nfsclient
 nfs_vnops.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 May 2008 00:20:20 -0000

attilio     2008-05-27 00:20:19 UTC

  FreeBSD src repository

  Modified files:
    sys/nfs4client       nfs4_vnops.c 
    sys/nfsclient        nfs_vnops.c 
  Log:
  Once the ENOLCK is detected we expect to retry the acquisition.
  Anyway, in the edge case the flushing happens and the while is no more
  executed, nfs_flush() (and nfs4_flush()) can return with a wrong
  err value of ENOLCK.
  Bring it back to 0, as we expect to have for that case.
  
  Reported by:    kris
  Reviewed by:    kib
  
  Revision  Changes    Path
  1.45      +3 -1      src/sys/nfs4client/nfs4_vnops.c
  1.285     +3 -1      src/sys/nfsclient/nfs_vnops.c