From owner-svn-src-projects@freebsd.org Thu Apr 19 23:53:55 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 DFD45F85D2B for ; Thu, 19 Apr 2018 23:53:55 +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 92CDD7D6B2; Thu, 19 Apr 2018 23:53:55 +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 8DB5710C26; Thu, 19 Apr 2018 23:53:55 +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 w3JNrtTu019101; Thu, 19 Apr 2018 23:53:55 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3JNrtCx019099; Thu, 19 Apr 2018 23:53:55 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201804192353.w3JNrtCx019099@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Thu, 19 Apr 2018 23:53:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r332801 - projects/pnfs-planb-server/sys/nfs X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/nfs X-SVN-Commit-Revision: 332801 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.25 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: Thu, 19 Apr 2018 23:53:56 -0000 Author: rmacklem Date: Thu Apr 19 23:53:55 2018 New Revision: 332801 URL: https://svnweb.freebsd.org/changeset/base/332801 Log: Update the nfssvc syscall to handle the mirrored DS recovery case. Modified: projects/pnfs-planb-server/sys/nfs/nfs_nfssvc.c projects/pnfs-planb-server/sys/nfs/nfssvc.h Modified: projects/pnfs-planb-server/sys/nfs/nfs_nfssvc.c ============================================================================== --- projects/pnfs-planb-server/sys/nfs/nfs_nfssvc.c Thu Apr 19 23:47:37 2018 (r332800) +++ projects/pnfs-planb-server/sys/nfs/nfs_nfssvc.c Thu Apr 19 23:53:55 2018 (r332801) @@ -106,7 +106,7 @@ sys_nfssvc(struct thread *td, struct nfssvc_args *uap) NFSSVC_PUBLICFH | NFSSVC_V4ROOTEXPORT | NFSSVC_NOPUBLICFH | NFSSVC_STABLERESTART | NFSSVC_ADMINREVOKE | NFSSVC_DUMPCLIENTS | NFSSVC_DUMPLOCKS | NFSSVC_BACKUPSTABLE | - NFSSVC_SUSPENDNFSD | NFSSVC_RESUMENFSD)) && + NFSSVC_SUSPENDNFSD | NFSSVC_RESUMENFSD | NFSSVC_PNFSDS)) && nfsd_call_nfsd != NULL) error = (*nfsd_call_nfsd)(td, uap); if (error == EINTR || error == ERESTART) Modified: projects/pnfs-planb-server/sys/nfs/nfssvc.h ============================================================================== --- projects/pnfs-planb-server/sys/nfs/nfssvc.h Thu Apr 19 23:47:37 2018 (r332800) +++ projects/pnfs-planb-server/sys/nfs/nfssvc.h Thu Apr 19 23:53:55 2018 (r332801) @@ -73,6 +73,7 @@ #define NFSSVC_DUMPMNTOPTS 0x10000000 #define NFSSVC_NEWSTRUCT 0x20000000 #define NFSSVC_FORCEDISM 0x40000000 +#define NFSSVC_PNFSDS 0x80000000 /* Argument structure for NFSSVC_DUMPMNTOPTS. */ struct nfscl_dumpmntopts {