d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfs: clean up empty lines in .c and .h files

Browse Source
This commit is contained in:
Mateusz Guzik 2020-09-01 21:25:39 +00:00
parent 1060326fb6
commit 7c8e2a57dd
9 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/nfs/bootp_subr.c
View File

@ -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;

11
sys/nfs/nfs_diskless.c
View File

@ -253,7 +253,7 @@ nfs_setup_diskless(void)
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 @@ nfs_setup_diskless(void)
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 @@ nfs_setup_diskless(void)
}
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 @@ nfs_setup_diskless(void)
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

2
sys/nfs/nfs_kdtrace.h
View File

@ -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)( \

1
sys/nfs/nfs_nfssvc.c
View File

@ -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);

2
sys/nfs/nfsproto.h
View File

@ -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 */

1
sys/nfs/xdr_subs.h
View File

@ -35,7 +35,6 @@
* $FreeBSD$
*/
#ifndef _NFS_XDR_SUBS_H_
#define _NFS_XDR_SUBS_H_

1
sys/nfsclient/nfs.h
View File

@ -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
*/

2
sys/nfsclient/nfsnode.h
View File

@ -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.

2
sys/nfsserver/nfsm_subs.h
View File

@ -61,8 +61,6 @@
* unions.
*/
/* ************************************* */
/* Dissection phase macros */