From owner-svn-src-projects@freebsd.org Mon Sep 4 20:27:13 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E96D0E1C25E for ; Mon, 4 Sep 2017 20:27:13 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B39E4AAF; Mon, 4 Sep 2017 20:27:13 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v84KRC8r055599; Mon, 4 Sep 2017 20:27:12 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v84KRCOo055598; Mon, 4 Sep 2017 20:27:12 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201709042027.v84KRCOo055598@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 4 Sep 2017 20:27:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323159 - projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Commit-Revision: 323159 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Sep 2017 20:27:14 -0000 Author: rmacklem Date: Mon Sep 4 20:27:12 2017 New Revision: 323159 URL: https://svnweb.freebsd.org/changeset/base/323159 Log: Fix handling of the case where one of the mirrors is no longer online. One small step towards handling failure/recovery of a mirror. Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Mon Sep 4 20:23:39 2017 (r323158) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Mon Sep 4 20:27:12 2017 (r323159) @@ -4191,7 +4191,7 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char struct nfsdevice *ds, *mds; struct pnfsdsfile *pf; uint32_t dsdir; - int done, error, fhiszero, gotone, i, j, mirrorcnt; + int done, error, fhiszero, gotone, i, mirrorcnt; *mirrorcntp = 1; fhiszero = 0; @@ -4243,7 +4243,6 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char } NFSDDSUNLOCK(); if (ds != NULL) { - gotone = 1; if (dvpp != NULL || fhiszero != 0) { dvp = ds->nfsdev_dsdir[dsdir]; error = vn_lock(dvp, lktype); @@ -4267,6 +4266,7 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char devid += NFSX_V4DEVICEID; } if (error == 0) { + gotone++; if (dvpp != NULL) { *tdvpp++ = dvp; *nmpp++ = nmp; @@ -4288,14 +4288,14 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char error = ENOENT; if (error == 0) - *mirrorcntp = mirrorcnt; - else if (i > 1 && dvpp != NULL && gotone != 0) { + *mirrorcntp = gotone; + else if (gotone > 0 && dvpp != NULL) { /* * If the error didn't occur on the first one and dvpp != NULL, * the one(s) prior to the failure will have locked dvp's that * need to be unlocked. */ - for (j = 1; j < i; j++) { + for (i = 0; i < gotone; i++) { NFSVOPUNLOCK(*dvpp, 0); *dvpp++ = NULL; }