From owner-cvs-src-old@FreeBSD.ORG Thu Apr 22 23:51:15 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2AAB10656F2 for ; Thu, 22 Apr 2010 23:51:15 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE7B78FC1B for ; Thu, 22 Apr 2010 23:51:15 +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 o3MNpFTJ093215 for ; Thu, 22 Apr 2010 23:51:15 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3MNpFiW093212 for cvs-src-old@freebsd.org; Thu, 22 Apr 2010 23:51:15 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201004222351.o3MNpFiW093212@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Thu, 22 Apr 2010 23:51:01 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD 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, 22 Apr 2010 23:51:16 -0000 rmacklem 2010-04-22 23:51:01 UTC FreeBSD src repository Modified files: 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 207082 on 2010-04-22 23:51:01Z by rmacklem 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. MFC after: 1 week Revision Changes Path 1.11 +2 -2 src/sys/fs/nfs/nfs_var.h 1.5 +4 -2 src/sys/fs/nfsclient/nfs.h 1.12 +20 -11 src/sys/fs/nfsclient/nfs_clbio.c 1.3 +4 -2 src/sys/fs/nfsclient/nfs_clnfsiod.c 1.6 +1 -1 src/sys/fs/nfsclient/nfs_clnode.c 1.8 +12 -4 src/sys/fs/nfsclient/nfs_clrpcops.c 1.14 +19 -6 src/sys/fs/nfsclient/nfs_clstate.c 1.19 +29 -8 src/sys/fs/nfsclient/nfs_clvnops.c