summaryrefslogtreecommitdiffstats
path: root/sys/nfsserver
diff options
context:
space:
mode:
authorrgrimes <rgrimes@FreeBSD.org>1995-05-30 08:16:23 +0000
committerrgrimes <rgrimes@FreeBSD.org>1995-05-30 08:16:23 +0000
commitc86f0c7a71e7ade3e38b325c186a9cf374e0411e (patch)
tree176f04f674860c7cfae9ac5d2ff4d4e1d73cb2b7 /sys/nfsserver
parent423ba8f9bc23d93bfc244aca9b12563b1c9de90d (diff)
downloadFreeBSD-src-c86f0c7a71e7ade3e38b325c186a9cf374e0411e.zip
FreeBSD-src-c86f0c7a71e7ade3e38b325c186a9cf374e0411e.tar.gz
Remove trailing whitespace.
Diffstat (limited to 'sys/nfsserver')
-rw-r--r--sys/nfsserver/nfs_serv.c16
-rw-r--r--sys/nfsserver/nfs_srvsock.c14
-rw-r--r--sys/nfsserver/nfs_srvsubs.c6
-rw-r--r--sys/nfsserver/nfs_syscalls.c4
-rw-r--r--sys/nfsserver/nfsm_subs.h4
5 files changed, 22 insertions, 22 deletions
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index bd8f0c3..366a076 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.12 1995/03/19 12:04:11 davidg Exp $
+ * $Id: nfs_serv.c,v 1.13 1995/05/29 04:01:08 davidg Exp $
*/
/*
@@ -966,7 +966,7 @@ nfsrv_rename(nfsd, mrep, md, dpos, cred, nam, mrq)
fromnd.ni_cnd.cn_cred = cred;
fromnd.ni_cnd.cn_nameiop = DELETE;
fromnd.ni_cnd.cn_flags = WANTPARENT | SAVESTART;
- error = nfs_namei(&fromnd, ffhp, len, nfsd->nd_slp, nam, &md, &dpos,
+ error = nfs_namei(&fromnd, ffhp, len, nfsd->nd_slp, nam, &md, &dpos,
nfsd->nd_procp);
if(error)
nfsm_reply(0);
@@ -1038,7 +1038,7 @@ out:
vm_object_deallocate((vm_object_t) fvp->v_vmdata);
if (deallocobjto)
vm_object_deallocate((vm_object_t) tvp->v_vmdata);
-
+
} else {
VOP_ABORTOP(tond.ni_dvp, &tond.ni_cnd);
if (tdvp == tvp)
@@ -1574,7 +1574,7 @@ again:
nfsm_clget;
*tl = txdr_unsigned(nlen);
bp += NFSX_UNSIGNED;
-
+
/* And loop around copying the name */
xfer = nlen;
cp = dp->d_name;
@@ -1594,7 +1594,7 @@ again:
for (i = 0; i < rem; i++)
*bp++ = '\0';
nfsm_clget;
-
+
/* Finish off the record */
*tl = txdr_unsigned(*cookiep);
bp += NFSX_UNSIGNED;
@@ -1761,7 +1761,7 @@ again:
if (dp->d_fileno != 0) {
nlen = dp->d_namlen;
rem = nfsm_rndup(nlen)-nlen;
-
+
/*
* For readdir_and_lookup get the vnode using
* the file number.
@@ -1827,7 +1827,7 @@ again:
nfsm_clget;
*tl = txdr_unsigned(nlen);
bp += NFSX_UNSIGNED;
-
+
/* And loop around copying the name */
xfer = nlen;
cp = dp->d_name;
@@ -1847,7 +1847,7 @@ again:
for (i = 0; i < rem; i++)
*bp++ = '\0';
nfsm_clget;
-
+
/* Finish off the record */
*tl = txdr_unsigned(*cookiep);
bp += NFSX_UNSIGNED;
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index ccd187a..20253ef 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.3 (Berkeley) 1/12/94
- * $Id: nfs_socket.c,v 1.5 1994/10/17 17:47:35 phk Exp $
+ * $Id: nfs_socket.c,v 1.6 1995/03/16 18:15:37 bde Exp $
*/
/*
@@ -226,7 +226,7 @@ nfs_connect(nmp, rep)
nmp->nm_so = (struct socket *)0;
saddr = mtod(nmp->nm_nam, struct sockaddr *);
- error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype,
+ error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype,
nmp->nm_soproto);
if (error)
goto bad;
@@ -529,7 +529,7 @@ tryagain:
}
so = rep->r_nmp->nm_so;
if (!so) {
- error = nfs_reconnect(rep);
+ error = nfs_reconnect(rep);
if (error) {
nfs_sndunlock(&rep->r_nmp->nm_flag);
return (error);
@@ -739,7 +739,7 @@ nfs_reply(myrep)
}
if (nam)
m_freem(nam);
-
+
/*
* Get the xid and check that it is an rpc reply
*/
@@ -1493,7 +1493,7 @@ nfs_realign(m, hsiz)
tcp = mtod(m, caddr_t);
mnew = m;
m2 = m->m_next;
-
+
/*
* If possible, only put the first invariant part
* of the RPC header in the first mbuf.
@@ -1501,7 +1501,7 @@ nfs_realign(m, hsiz)
mlen = M_TRAILINGSPACE(m);
if (olen <= hsiz && mlen > hsiz)
mlen = hsiz;
-
+
/*
* Loop through the mbuf list consolidating data.
*/
@@ -1534,7 +1534,7 @@ nfs_realign(m, hsiz)
fcp = mtod(m, caddr_t);
}
}
-
+
/*
* Finally, set m_len == 0 for any trailing mbufs that have
* been copied out of.
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 3ccc10a..9aeb0d6 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.13 1995/04/21 02:58:49 dyson Exp $
+ * $Id: nfs_subs.c,v 1.14 1995/05/29 04:01:09 davidg Exp $
*/
/*
@@ -137,7 +137,7 @@ nfsm_reqh(vp, procid, hsiz, bposp)
MCLGET(mb, M_WAIT);
mb->m_len = 0;
bpos = mtod(mb, caddr_t);
-
+
/*
* For NQNFS, add lease request.
*/
@@ -723,7 +723,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
}
/*
* If v_type == VNON it is a new node, so fill in the v_type,
- * n_mtime fields. Check to see if it represents a special
+ * n_mtime fields. Check to see if it represents a special
* device, and if so, check for a possible alias. Once the
* correct vnode has been obtained, fill in the rest of the
* information.
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 8cdbfe7..f7e159f 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_syscalls.c,v 1.4 1994/10/02 17:27:02 phk Exp $
+ * $Id: nfs_syscalls.c,v 1.5 1994/10/17 17:47:38 phk Exp $
*/
#include <sys/param.h>
@@ -319,7 +319,7 @@ nfssvc_addsock(fp, mynam)
siz = NFS_MAXPACKET + sizeof (u_long);
else
siz = NFS_MAXPACKET;
- error = soreserve(so, siz, siz);
+ error = soreserve(so, siz, siz);
if (error) {
m_freem(mynam);
return (error);
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index 994c0b6..030a985 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfsm_subs.h 8.1 (Berkeley) 6/16/93
- * $Id: nfsm_subs.h,v 1.4 1994/10/02 17:27:05 phk Exp $
+ * $Id: nfsm_subs.h,v 1.5 1994/10/17 17:47:42 phk Exp $
*/
#ifndef _NFS_NFSM_SUBS_H_
@@ -167,7 +167,7 @@ extern struct mbuf *nfsm_reqh();
mb = mreq = nfsm_reqh((v),(a),(s),&bpos)
#define nfsm_reqdone m_freem(mrep); \
- nfsmout:
+ nfsmout:
#define nfsm_rndup(a) (((a)+3)&(~0x3))
OpenPOWER on IntegriCloud