From owner-cvs-src-old@FreeBSD.ORG Thu Apr 29 23:48:27 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B9F6E1065670 for ; Thu, 29 Apr 2010 23:48:27 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A549C8FC13 for ; Thu, 29 Apr 2010 23:48:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3TNmRQJ092412 for ; Thu, 29 Apr 2010 23:48:27 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3TNmROx092411 for cvs-src-old@freebsd.org; Thu, 29 Apr 2010 23:48:27 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201004292348.o3TNmROx092411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Thu, 29 Apr 2010 23:48:09 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/sys/fs/nfs nfs_var.h src/sys/fs/nfsclient nfs.h nfs_clbio.c nfs_clnfsiod.c nfs_clnode.c nfs_clrpcops.c nfs_clstate.c nfs_clvnops.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2010 23:48:27 -0000 rmacklem 2010-04-29 23:48:09 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) sys/fs/nfs nfs_var.h sys/fs/nfsclient nfs.h nfs_clbio.c nfs_clnfsiod.c nfs_clnode.c nfs_clrpcops.c nfs_clstate.c nfs_clvnops.c Log: SVN rev 207406 on 2010-04-29 23:48:09Z by rmacklem MFC: r207082 When the experimental NFS client is handling an NFSv4 server reboot with delegations enabled, the recovery could fail if the renew thread is trying to return a delegation, since it will not do the recovery. This patch fixes the above by having nfscl_recalldeleg() fail with the I/O operations returning EIO, so that they will be attempted later. Most of the patch consists of adding an argument to various functions to indicate the delegation recall case where this needs to be done. Revision Changes Path 1.6.2.5 +2 -2 src/sys/fs/nfs/nfs_var.h 1.2.2.4 +4 -2 src/sys/fs/nfsclient/nfs.h 1.9.2.4 +20 -11 src/sys/fs/nfsclient/nfs_clbio.c 1.1.2.3 +4 -2 src/sys/fs/nfsclient/nfs_clnfsiod.c 1.4.2.3 +1 -1 src/sys/fs/nfsclient/nfs_clnode.c 1.4.2.4 +12 -4 src/sys/fs/nfsclient/nfs_clrpcops.c 1.7.2.8 +19 -6 src/sys/fs/nfsclient/nfs_clstate.c 1.13.2.5 +29 -8 src/sys/fs/nfsclient/nfs_clvnops.c