From owner-svn-src-head@freebsd.org Tue Sep 1 21:25:41 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D0299379C89; Tue, 1 Sep 2020 21:25:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0VF58WPz4KDr; Tue, 1 Sep 2020 21:25:41 +0000 (UTC) (envelope-from mjg@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 7B5DC1FD76; Tue, 1 Sep 2020 21:25:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LPfaw024763; Tue, 1 Sep 2020 21:25:41 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LPd7J024754; Tue, 1 Sep 2020 21:25:39 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012125.081LPd7J024754@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:25:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365082 - in head/sys: nfs nfsclient nfsserver X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: nfs nfsclient nfsserver X-SVN-Commit-Revision: 365082 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:25:41 -0000 Author: mjg Date: Tue Sep 1 21:25:39 2020 New Revision: 365082 URL: https://svnweb.freebsd.org/changeset/base/365082 Log: nfs: clean up empty lines in .c and .h files Modified: head/sys/nfs/bootp_subr.c head/sys/nfs/nfs_diskless.c head/sys/nfs/nfs_kdtrace.h head/sys/nfs/nfs_nfssvc.c head/sys/nfs/nfsproto.h head/sys/nfs/xdr_subs.h head/sys/nfsclient/nfs.h head/sys/nfsclient/nfsnode.h head/sys/nfsserver/nfsm_subs.h Modified: head/sys/nfs/bootp_subr.c ============================================================================== --- head/sys/nfs/bootp_subr.c Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/bootp_subr.c Tue Sep 1 21:25:39 2020 (r365082) @@ -459,7 +459,6 @@ bootpc_received(struct bootpc_globalcontext *gctx, ifctx->dhcpquerytype == DHCP_REQUEST) ifctx->state = IF_DHCP_RESOLVED; - if (ifctx->dhcpquerytype == DHCP_DISCOVER && ifctx->state != IF_BOOTP_RESOLVED) { p = bootpc_tag(&gctx->tmptag, &ifctx->reply, @@ -567,7 +566,6 @@ bootpc_call(struct bootpc_globalcontext *gctx, struct timo = 0; rtimo = 0; for (;;) { - outstanding = 0; gotrootpath = 0; Modified: head/sys/nfs/nfs_diskless.c ============================================================================== --- head/sys/nfs/nfs_diskless.c Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/nfs_diskless.c Tue Sep 1 21:25:39 2020 (r365082) @@ -253,7 +253,7 @@ match_done: if (is_nfsv3 != 0) { strlcpy(nd3->myif.ifra_name, ifp->if_xname, sizeof(nd3->myif.ifra_name)); - + /* set up gateway */ inaddr_to_sockaddr("boot.netif.gateway", &nd3->mygateway); @@ -287,12 +287,12 @@ match_done: nfs_parse_options(cp, &nd3->root_args); freeenv(cp); } - + nfs_diskless_valid = 3; } else { strlcpy(nd->myif.ifra_name, ifp->if_xname, sizeof(nd->myif.ifra_name)); - + /* set up gateway */ inaddr_to_sockaddr("boot.netif.gateway", &nd->mygateway); @@ -319,7 +319,7 @@ match_done: } if ((cp = kern_getenv("boot.nfsroot.options")) != NULL) { struct nfs_args args; - + /* * XXX yech, convert between old and current * arg format @@ -335,7 +335,7 @@ match_done: nd->root_args.wsize = args.wsize; freeenv(cp); } - + nfs_diskless_valid = 1; } } @@ -436,4 +436,3 @@ nfs_rootconf(void) SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, nfs_rootconf, NULL); #endif - Modified: head/sys/nfs/nfs_kdtrace.h ============================================================================== --- head/sys/nfs/nfs_kdtrace.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/nfs_kdtrace.h Tue Sep 1 21:25:39 2020 (r365082) @@ -57,7 +57,7 @@ extern uint32_t nfsclient_accesscache_load_done_id; nfsclient_accesscache_get_hit_id, (vp), (uid), \ (mode)); \ } while (0) - + #define KDTRACE_NFS_ACCESSCACHE_GET_MISS(vp, uid, mode) do { \ if (dtrace_nfsclient_accesscache_get_miss_probe != NULL) \ (dtrace_nfsclient_accesscache_get_miss_probe)( \ Modified: head/sys/nfs/nfs_nfssvc.c ============================================================================== --- head/sys/nfs/nfs_nfssvc.c Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/nfs_nfssvc.c Tue Sep 1 21:25:39 2020 (r365082) @@ -151,4 +151,3 @@ DECLARE_MODULE(nfssvc, nfssvc_mod, SI_SUB_VFS, SI_ORDE /* So that loader and kldload(2) can find us, wherever we are.. */ MODULE_VERSION(nfssvc, 1); - Modified: head/sys/nfs/nfsproto.h ============================================================================== --- head/sys/nfs/nfsproto.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/nfsproto.h Tue Sep 1 21:25:39 2020 (r365082) @@ -137,8 +137,6 @@ #define NFSERR_FILE_OPEN 10046 #define NFSERR_STALEWRITEVERF 30001 /* Fake return for nfs_commit() */ - - #define NFSERR_RETVOID 0x20000000 /* Return void, not error */ #define NFSERR_AUTHERR 0x40000000 /* Mark an authentication error */ #define NFSERR_RETERR 0x80000000 /* Mark an error return for V3 */ Modified: head/sys/nfs/xdr_subs.h ============================================================================== --- head/sys/nfs/xdr_subs.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/xdr_subs.h Tue Sep 1 21:25:39 2020 (r365082) @@ -35,7 +35,6 @@ * $FreeBSD$ */ - #ifndef _NFS_XDR_SUBS_H_ #define _NFS_XDR_SUBS_H_ Modified: head/sys/nfsclient/nfs.h ============================================================================== --- head/sys/nfsclient/nfs.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfsclient/nfs.h Tue Sep 1 21:25:39 2020 (r365082) @@ -100,7 +100,6 @@ #define NFSSTA_TIMEO 0x10000000 /* Experiencing a timeout */ #define NFSSTA_LOCKTIMEO 0x20000000 /* Experiencing a lockd timeout */ - /* * XXX to allow amd to include nfs.h without nfsproto.h */ Modified: head/sys/nfsclient/nfsnode.h ============================================================================== --- head/sys/nfsclient/nfsnode.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfsclient/nfsnode.h Tue Sep 1 21:25:39 2020 (r365082) @@ -83,7 +83,7 @@ struct nfs_accesscache { uid_t uid; /* credentials having mode */ time_t stamp; /* mode cache timestamp */ }; - + /* * The nfsnode is the nfs equivalent to ufs's inode. Any similarity * is purely coincidental. Modified: head/sys/nfsserver/nfsm_subs.h ============================================================================== --- head/sys/nfsserver/nfsm_subs.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfsserver/nfsm_subs.h Tue Sep 1 21:25:39 2020 (r365082) @@ -61,8 +61,6 @@ * unions. */ - - /* ************************************* */ /* Dissection phase macros */