From owner-svn-src-projects@freebsd.org Wed May 16 00:57:44 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA420EE24EA for ; Wed, 16 May 2018 00:57:43 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 90E546DE2D; Wed, 16 May 2018 00:57:43 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 699C61325F; Wed, 16 May 2018 00:57:43 +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 w4G0vhvO015953; Wed, 16 May 2018 00:57:43 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4G0vg88015951; Wed, 16 May 2018 00:57:42 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201805160057.w4G0vg88015951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Wed, 16 May 2018 00:57:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r333656 - in projects/pnfs-planb-server/sys/fs: nfs nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/pnfs-planb-server/sys/fs: nfs nfsserver X-SVN-Commit-Revision: 333656 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.26 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: Wed, 16 May 2018 00:57:44 -0000 Author: rmacklem Date: Wed May 16 00:57:42 2018 New Revision: 333656 URL: https://svnweb.freebsd.org/changeset/base/333656 Log: Fix two cases where the test for "no mirrors" didn't traverse the list checking for a valid mirror. Modified: projects/pnfs-planb-server/sys/fs/nfs/nfs_commonsubs.c projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Modified: projects/pnfs-planb-server/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfs/nfs_commonsubs.c Tue May 15 23:55:38 2018 (r333655) +++ projects/pnfs-planb-server/sys/fs/nfs/nfs_commonsubs.c Wed May 16 00:57:42 2018 (r333656) @@ -4331,8 +4331,12 @@ nfsv4_findmirror(struct nfsmount *nmp, struct nfsdevic if (fndds != NULL) break; if (ds->nfsdev_nmp == nmp) { - /* If there are no mirrors, return error. */ - if (TAILQ_EMPTY(&ds->nfsdev_mirrors)) { + /* If there are no mirrors, return NULL. */ + TAILQ_FOREACH(mds, &ds->nfsdev_mirrors, nfsdev_list) { + if (mds->nfsdev_nmp != NULL) + break; + } + if (mds == NULL) { NFSCL_DEBUG(4, "no mirror for DS\n"); return (NULL); } Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Tue May 15 23:55:38 2018 (r333655) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Wed May 16 00:57:42 2018 (r333656) @@ -7220,7 +7220,11 @@ nfsrv_delds(char *devid, NFSPROC_T *p) if (NFSBCMP(ds->nfsdev_deviceid, devid, NFSX_V4DEVICEID) == 0 && ds->nfsdev_nmp != NULL) { /* If there are no mirrors, return error. */ - if (TAILQ_EMPTY(&ds->nfsdev_mirrors)) { + TAILQ_FOREACH(mds, &ds->nfsdev_mirrors, nfsdev_list) { + if (mds->nfsdev_nmp != NULL) + break; + } + if (mds == NULL) { NFSDDSUNLOCK(); NFSD_DEBUG(4, "no mirror for DS\n"); return (ENXIO);