From owner-svn-src-projects@freebsd.org Sat Aug 19 00:37:32 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 C1C15DE3AEA
for <svn-src-projects@mailman.ysv.freebsd.org>;
Sat, 19 Aug 2017 00:37:32 +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 8BAEF8019A;
Sat, 19 Aug 2017 00:37:32 +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 v7J0bV4X017788;
Sat, 19 Aug 2017 00:37:31 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7J0bVwS017787;
Sat, 19 Aug 2017 00:37:31 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201708190037.v7J0bVwS017787@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: Sat, 19 Aug 2017 00:37:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r322679 -
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: 322679
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" <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: Sat, 19 Aug 2017 00:37:32 -0000
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;
}
}