svn commit: r322679 - projects/pnfs-planb-server-stable11/sys/fs/nfsserver

[Rick Macklem]

Author: rmacklem
Date: Sat Aug 19 00:37:31 2017
New Revision: 322679
URL: https://svnweb.freebsd.org/changeset/base/322679

Log:
  Set nfsrv_doflexfile == 1 when there are mirrors, since File Layout doesn't
  support mirrors.

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	Sat Aug 19 00:32:26 2017	(r322678)
+++ projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c	Sat Aug 19 00:37:31 2017	(r322679)
@@ -47,6 +47,7 @@ extern struct mtx nfsrv_dslock_mtx;
 extern int nfsd_debuglevel;
 extern u_int nfsrv_dsdirsize;
 extern struct nfsdevicehead nfsrv_devidhead;
+extern int nfsrv_doflexfile;
 NFSV4ROOTLOCKMUTEX;
 NFSSTATESPINLOCK;
 
@@ -6851,8 +6852,10 @@ nfsrv_setdsserver(char *dspathp, char *mirrorp, NFSPRO
 				i++;
 			if (i > NFSDEV_MAXMIRRORS)
 				error = ENXIO;
-			else if (i > nfsrv_maxpnfsmirror)
+			else if (i > nfsrv_maxpnfsmirror) {
 				nfsrv_maxpnfsmirror = i;
+				nfsrv_doflexfile = 1;	/* Force Flex File. */
+			}
 			break;
 		}
 	}