diff options
author | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 21:25:39 +0000 |
---|---|---|
committer | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 21:25:39 +0000 |
commit | 7c8e2a57ddc4c00add6ba2468d9cdf85b77b4d5b (patch) | |
tree | b38eb4dea606d5d6d9b53b4047fd2827c9de17f0 /sys/nfs | |
parent | 1060326fb64947686dc13e07af5d71b32cd8a88f (diff) | |
download | src-test2-7c8e2a57ddc4c00add6ba2468d9cdf85b77b4d5b.tar.gz src-test2-7c8e2a57ddc4c00add6ba2468d9cdf85b77b4d5b.zip |
nfs: clean up empty lines in .c and .h files
Notes
Notes:
svn path=/head/; revision=365082
Diffstat (limited to 'sys/nfs')
-rw-r--r-- | sys/nfs/bootp_subr.c | 2 | ||||
-rw-r--r-- | sys/nfs/nfs_diskless.c | 11 | ||||
-rw-r--r-- | sys/nfs/nfs_kdtrace.h | 2 | ||||
-rw-r--r-- | sys/nfs/nfs_nfssvc.c | 1 | ||||
-rw-r--r-- | sys/nfs/nfsproto.h | 2 | ||||
-rw-r--r-- | sys/nfs/xdr_subs.h | 1 |
6 files changed, 6 insertions, 13 deletions
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c index 65e81fbade0e..fd0e0653a02c 100644 --- a/sys/nfs/bootp_subr.c +++ b/sys/nfs/bootp_subr.c @@ -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 thread *td) timo = 0; rtimo = 0; for (;;) { - outstanding = 0; gotrootpath = 0; diff --git a/sys/nfs/nfs_diskless.c b/sys/nfs/nfs_diskless.c index b621ed452e0e..6df01e56f9b2 100644 --- a/sys/nfs/nfs_diskless.c +++ b/sys/nfs/nfs_diskless.c @@ -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 - diff --git a/sys/nfs/nfs_kdtrace.h b/sys/nfs/nfs_kdtrace.h index 13d68aa51e79..560937fd2707 100644 --- a/sys/nfs/nfs_kdtrace.h +++ b/sys/nfs/nfs_kdtrace.h @@ -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)( \ diff --git a/sys/nfs/nfs_nfssvc.c b/sys/nfs/nfs_nfssvc.c index 19ac16a933f5..a16ff8b36448 100644 --- a/sys/nfs/nfs_nfssvc.c +++ b/sys/nfs/nfs_nfssvc.c @@ -151,4 +151,3 @@ DECLARE_MODULE(nfssvc, nfssvc_mod, SI_SUB_VFS, SI_ORDER_ANY); /* So that loader and kldload(2) can find us, wherever we are.. */ MODULE_VERSION(nfssvc, 1); - diff --git a/sys/nfs/nfsproto.h b/sys/nfs/nfsproto.h index dfaf7689fae4..4f7f838d01d6 100644 --- a/sys/nfs/nfsproto.h +++ b/sys/nfs/nfsproto.h @@ -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 */ diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h index 829711e8ddd5..a4f7ae0b7e40 100644 --- a/sys/nfs/xdr_subs.h +++ b/sys/nfs/xdr_subs.h @@ -35,7 +35,6 @@ * $FreeBSD$ */ - #ifndef _NFS_XDR_SUBS_H_ #define _NFS_XDR_SUBS_H_ |