From owner-svn-src-projects@freebsd.org  Thu Aug 10 21:58:01 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
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 1C452DDDD98
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu, 10 Aug 2017 21:58:01 +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 DD91A72E62;
 Thu, 10 Aug 2017 21:58:00 +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 v7ALw0xK018034;
 Thu, 10 Aug 2017 21:58:00 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7ALw0Z6018030;
 Thu, 10 Aug 2017 21:58:00 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201708102158.v7ALw0Z6018030@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to
 rmacklem@FreeBSD.org using -f
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 10 Aug 2017 21:58:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r322378 -
 projects/pnfs-planb-server-stable11/sys/fs/nfsserver
X-SVN-Group: projects
X-SVN-Commit-Author: rmacklem
X-SVN-Commit-Paths: projects/pnfs-planb-server-stable11/sys/fs/nfsserver
X-SVN-Commit-Revision: 322378
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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Aug 2017 21:58:01 -0000

Author: rmacklem
Date: Thu Aug 10 21:57:59 2017
New Revision: 322378
URL: https://svnweb.freebsd.org/changeset/base/322378

Log:
  Add some handling of mirror limits.

Modified:
  projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c

Modified: projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c	Thu Aug 10 21:48:34 2017	(r322377)
+++ projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c	Thu Aug 10 21:57:59 2017	(r322378)
@@ -6839,7 +6839,9 @@ nfsrv_setdsserver(char *dspathp, char *mirrorp, NFSPRO
 			i = 1;
 			TAILQ_FOREACH(tds, &mds->nfsdev_mirrors, nfsdev_list)
 				i++;
-			if (i > nfsrv_maxpnfsmirror)
+			if (i > NFSDEV_MAXMIRRORS)
+				error = ENXIO;
+			else if (i > nfsrv_maxpnfsmirror)
 				nfsrv_maxpnfsmirror = i;
 			break;
 		}
@@ -6940,6 +6942,7 @@ nfsrv_createdevids(struct nfsd_nfsd_args *args, NFSPRO
 	dnshostp = args->dnshost;
 	dspathp = args->dspath;
 	mirrorp = args->mirror;
+	nfsrv_maxpnfsmirror = 1;
 	if (addrp == NULL || dnshostp == NULL || dspathp == NULL ||
 	    mirrorp == NULL)
 		return (0);