aboutsummaryrefslogtreecommitdiff
path: root/sys/fs/nfs
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:18:40 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:18:40 +0000
commit586ee69f09c5060621486b34722a4a806581f93d (patch)
treeb9a9c77a109f6c99f8730c43bb85b035543881f8 /sys/fs/nfs
parent50cedfede3d21824ec6023324b3ad41a435e1815 (diff)
downloadsrc-586ee69f09c5060621486b34722a4a806581f93d.tar.gz
src-586ee69f09c5060621486b34722a4a806581f93d.zip
fs: clean up empty lines in .c and .h files
Notes
Notes: svn path=/head/; revision=365070
Diffstat (limited to 'sys/fs/nfs')
-rw-r--r--sys/fs/nfs/nfs.h1
-rw-r--r--sys/fs/nfs/nfs_commonkrpc.c14
-rw-r--r--sys/fs/nfs/nfs_commonport.c2
-rw-r--r--sys/fs/nfs/nfs_commonsubs.c12
-rw-r--r--sys/fs/nfs/nfs_var.h1
-rw-r--r--sys/fs/nfs/nfsdport.h1
-rw-r--r--sys/fs/nfs/nfsm_subs.h1
-rw-r--r--sys/fs/nfs/nfsproto.h1
-rw-r--r--sys/fs/nfs/rpcv2.h2
9 files changed, 13 insertions, 22 deletions
diff --git a/sys/fs/nfs/nfs.h b/sys/fs/nfs/nfs.h
index 70b2536245ff..f6acb807fc6e 100644
--- a/sys/fs/nfs/nfs.h
+++ b/sys/fs/nfs/nfs.h
@@ -579,7 +579,6 @@ struct uio; struct buf; struct vattr; struct nameidata; /* XXX */
((e) != EINTR && (e) != ERESTART && (e) != EWOULDBLOCK && \
((s) & PR_CONNREQUIRED) == 0)
-
/*
* This structure holds socket information for a connection. Used by the
* client and the server for callbacks.
diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c
index d47d23e30ab3..19896a59718d 100644
--- a/sys/fs/nfs/nfs_commonkrpc.c
+++ b/sys/fs/nfs/nfs_commonkrpc.c
@@ -489,7 +489,6 @@ nfs_getauth(struct nfssockreq *nrp, int secflavour, char *clnt_principal,
case AUTH_SYS:
default:
return (authunix_create(cred));
-
}
}
@@ -734,7 +733,7 @@ newnfs_request(struct nfsrv_descript *nd, struct nfsmount *nmp,
if (dtrace_nfscl_nfs234_start_probe != NULL) {
uint32_t probe_id;
int probe_procnum;
-
+
if (nd->nd_flag & ND_NFSV4) {
probe_id =
nfscl_nfs4_start_probes[nd->nd_procnum];
@@ -1257,13 +1256,13 @@ static int
nfs_sig_pending(sigset_t set)
{
int i;
-
+
for (i = 0 ; i < nitems(newnfs_sig_set); i++)
if (SIGISMEMBER(set, newnfs_sig_set[i]))
return (1);
return (0);
}
-
+
/*
* The set/restore sigmask functions are used to (temporarily) overwrite
* the thread td_sigmask during an RPC call (for example). These are also
@@ -1275,7 +1274,7 @@ newnfs_set_sigmask(struct thread *td, sigset_t *oldset)
sigset_t newset;
int i;
struct proc *p;
-
+
SIGFILLSET(newset);
if (td == NULL)
td = curthread; /* XXX */
@@ -1337,7 +1336,7 @@ newnfs_sigintr(struct nfsmount *nmp, struct thread *td)
{
struct proc *p;
sigset_t tmpset;
-
+
/* Terminate all requests while attempting a forced unmount. */
if (NFSCL_FORCEDISM(nmp->nm_mountp))
return (EIO);
@@ -1420,7 +1419,7 @@ nfs_up(struct nfsmount *nmp, struct thread *td, const char *msg,
VQ_NOTRESP, 1);
} else
mtx_unlock(&nmp->nm_mtx);
-
+
mtx_lock(&nmp->nm_mtx);
if ((flags & NFSSTA_LOCKTIMEO) && (nmp->nm_state & NFSSTA_LOCKTIMEO)) {
nmp->nm_state &= ~NFSSTA_LOCKTIMEO;
@@ -1430,4 +1429,3 @@ nfs_up(struct nfsmount *nmp, struct thread *td, const char *msg,
} else
mtx_unlock(&nmp->nm_mtx);
}
-
diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c
index 86fa0458d192..3da31c3bc346 100644
--- a/sys/fs/nfs/nfs_commonport.c
+++ b/sys/fs/nfs/nfs_commonport.c
@@ -420,7 +420,6 @@ newnfs_timer(void *arg)
callout_reset(&newnfsd_callout, nfscl_ticks, newnfs_timer, NULL);
}
-
/*
* Sleep for a short period of time unless errval == NFSERR_GRACE, where
* the sleep should be for 5 seconds.
@@ -952,4 +951,3 @@ DECLARE_MODULE(nfscommon, nfscommon_mod, SI_SUB_VFS, SI_ORDER_ANY);
MODULE_VERSION(nfscommon, 1);
MODULE_DEPEND(nfscommon, nfssvc, 1, 1, 1);
MODULE_DEPEND(nfscommon, krpc, 1, 1, 1);
-
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index 00e1825d69f6..65d4513b1699 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -364,7 +364,7 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp,
mb->m_len = 0;
nd->nd_mreq = nd->nd_mb = mb;
nd->nd_bpos = mtod(mb, char *);
-
+
/*
* And fill the first file handle into the request.
*/
@@ -2559,7 +2559,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp,
xattrsupp = true;
}
}
-
+
/*
* Put out the attribute bitmap for the ones being filled in
* and get the field for the number of attributes returned.
@@ -3272,7 +3272,7 @@ tryagain:
len -= (nfsrv_dnsnamelen + 1);
*(cp - 1) = '\0';
}
-
+
/*
* Check for the special case of "nobody".
*/
@@ -3281,7 +3281,7 @@ tryagain:
error = 0;
goto out;
}
-
+
hp = NFSUSERNAMEHASH(str, len);
mtx_lock(&hp->mtx);
TAILQ_FOREACH(usrp, &hp->lughead, lug_namehash) {
@@ -3484,7 +3484,7 @@ tryagain:
len -= (nfsrv_dnsnamelen + 1);
*(cp - 1) = '\0';
}
-
+
/*
* Check for the special case of "nogroup".
*/
@@ -3493,7 +3493,7 @@ tryagain:
error = 0;
goto out;
}
-
+
hp = NFSGROUPNAMEHASH(str, len);
mtx_lock(&hp->mtx);
TAILQ_FOREACH(usrp, &hp->lughead, lug_namehash) {
diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h
index ce62ad5c8e6c..a3c53e80ace3 100644
--- a/sys/fs/nfs/nfs_var.h
+++ b/sys/fs/nfs/nfs_var.h
@@ -776,4 +776,3 @@ void nfsrvd_init(int);
/* nfs_clkrpc.c */
int nfscbd_addsock(struct file *);
int nfscbd_nfsd(NFSPROC_T *, struct nfsd_nfscbd_args *);
-
diff --git a/sys/fs/nfs/nfsdport.h b/sys/fs/nfs/nfsdport.h
index 33b9ba43ba1e..28b155fba722 100644
--- a/sys/fs/nfs/nfsdport.h
+++ b/sys/fs/nfs/nfsdport.h
@@ -118,4 +118,3 @@ struct nfsexstuff {
if (nfsd_debuglevel >= (level)) \
printf(__VA_ARGS__); \
} while (0)
-
diff --git a/sys/fs/nfs/nfsm_subs.h b/sys/fs/nfs/nfsm_subs.h
index 32d4eed6a5eb..671bd23ae313 100644
--- a/sys/fs/nfs/nfsm_subs.h
+++ b/sys/fs/nfs/nfsm_subs.h
@@ -37,7 +37,6 @@
#ifndef _NFS_NFSM_SUBS_H_
#define _NFS_NFSM_SUBS_H_
-
/*
* These macros do strange and peculiar things to mbuf chains for
* the assistance of the nfs code. To attempt to use them for any
diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h
index 4784046b56e2..c123152a7cb7 100644
--- a/sys/fs/nfs/nfsproto.h
+++ b/sys/fs/nfs/nfsproto.h
@@ -1137,7 +1137,6 @@ struct nfsv3_sattr {
NFSATTRBM_QUOTAUSED | \
NFSATTRBM_FSLAYOUTTYPE)
-
#ifdef QUOTA
/*
* If QUOTA OR in NFSATTRBIT_QUOTAHARD, NFSATTRBIT_QUOTASOFT and
diff --git a/sys/fs/nfs/rpcv2.h b/sys/fs/nfs/rpcv2.h
index 799d9d6e0dff..d858afe2cc3c 100644
--- a/sys/fs/nfs/rpcv2.h
+++ b/sys/fs/nfs/rpcv2.h
@@ -199,7 +199,7 @@
#define RPCMNT_NAMELEN 255
#define RPCMNT_PATHLEN 1024
#define RPCPROG_NFS 100003
-
+
/* Structs for common parts of the rpc's */
struct rpcv2_time {
u_int32_t rpc_sec;