From owner-svn-src-projects@freebsd.org Fri Apr 28 01:54:03 2017 Return-Path: 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 067D5D5412A for ; Fri, 28 Apr 2017 01:54:03 +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 A5B051D0D; Fri, 28 Apr 2017 01:54:02 +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 v3S1s17O085570; Fri, 28 Apr 2017 01:54:01 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3S1s18F085567; Fri, 28 Apr 2017 01:54:01 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201704280154.v3S1s18F085567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Fri, 28 Apr 2017 01:54:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r317540 - projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Group: projects 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Apr 2017 01:54:03 -0000 Author: rmacklem Date: Fri Apr 28 01:54:01 2017 New Revision: 317540 URL: https://svnweb.freebsd.org/changeset/base/317540 Log: Fix up the build. Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdkrpc.c projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdkrpc.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdkrpc.c Fri Apr 28 01:36:43 2017 (r317539) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdkrpc.c Fri Apr 28 01:54:01 2017 (r317540) @@ -103,6 +103,7 @@ static int nfs_proc(struct nfsrv_descrip extern u_long sb_max_adj; extern int newnfs_numnfsd; extern struct proc *nfsd_master_proc; +extern time_t nfsdev_time; /* * NFS server system calls @@ -493,6 +494,7 @@ nfsrvd_nfsd(struct thread *td, struct nf */ NFSD_LOCK(); if (newnfs_numnfsd == 0) { + nfsdev_time = time_second; p = td->td_proc; PROC_LOCK(p); p->p_flag2 |= P2_AST_SU; Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Fri Apr 28 01:36:43 2017 (r317539) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Fri Apr 28 01:54:01 2017 (r317540) @@ -1766,7 +1766,6 @@ nfsrvd_readdir(struct nfsrv_descript *nd fullsiz = siz; if (nd->nd_flag & ND_NFSV3) { nd->nd_repstat = getret = nfsvno_getattr(vp, &at, nd, p, 1); - p, 1); #if 0 /* * va_filerev is not sufficient as a cookie verifier, Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Fri Apr 28 01:36:43 2017 (r317539) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Fri Apr 28 01:54:01 2017 (r317540) @@ -35,6 +35,8 @@ struct nfsrv_stablefirst nfsrv_stablefir int nfsrv_issuedelegs = 0; int nfsrv_dolocallocks = 0; struct nfsv4lock nfsv4rootfs_lock; +struct nfsdevicehead nfsrv_devidhead; +time_t nfsdev_time = 0; extern int newnfs_numnfsd; extern struct nfsstatsv1 nfsstatsv1;