vfs/nfs: Revert white space changes

freebsd/sys/fs/nfs/nfs_commonkrpc.c

@@ -1443,3 +1443,4 @@ nfs_up(struct nfsmount *nmp, struct thread *td, const char *msg,
 	} else
 		mtx_unlock(&nmp->nm_mtx);
 }
+

freebsd/sys/fs/nfs/nfs_commonport.c

@@ -818,3 +818,4 @@ 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);
+

freebsd/sys/fs/nfs/nfs_commonsubs.c

@@ -4770,3 +4770,4 @@ nfsv4_findmirror(struct nfsmount *nmp)
 	}
 	return (ds);
 }
+

freebsd/sys/fs/nfsclient/nfs.h

@@ -96,8 +96,7 @@ void ncl_doio_directwrite(struct buf *);
 int ncl_bioread(struct vnode *, struct uio *, int, struct ucred *);
 int ncl_biowrite(struct vnode *, struct uio *, int, struct ucred *);
 int ncl_vinvalbuf(struct vnode *, int, struct thread *, int);
-int ncl_asyncio(struct
+int ncl_asyncio(struct nfsmount *, struct buf *, struct ucred *,
-		nfsmount *, struct buf *, struct ucred *,
     struct thread *);
 int ncl_doio(struct vnode *, struct buf *, struct ucred *, struct thread *,
     int);

freebsd/sys/fs/nfsclient/nfs_clbio.c

@@ -1695,7 +1695,7 @@ ncl_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td,
 				PROC_UNLOCK(p);
 #else /* __rtems__ */
 				panic("nfsclient: text file modification: want to killproc");
-#endif /* _-rtems__ */
+#endif /* __rtems__ */
 			} else
 				NFSUNLOCKNODE(np);
 		}
@@ -1923,3 +1923,4 @@ ncl_meta_setsize(struct vnode *vp, struct thread *td, u_quad_t nsize)
 	}
 	return(error);
 }
+

freebsd/sys/fs/nfsclient/nfs_clkrpc.c

@@ -298,3 +298,4 @@ nfsrvd_cbinit(int terminating)
 		NFSD_LOCK();
 	}
 }
+

freebsd/sys/fs/nfsclient/nfs_clport.c

@@ -1452,3 +1452,4 @@ MODULE_DEPEND(nfscl, nfscommon, 1, 1, 1);
 MODULE_DEPEND(nfscl, krpc, 1, 1, 1);
 MODULE_DEPEND(nfscl, nfssvc, 1, 1, 1);
 MODULE_DEPEND(nfscl, nfslock, 1, 1, 1);
+

freebsd/sys/fs/nfsclient/nfs_clrpcops.c

@@ -7740,3 +7740,4 @@ out:
 	}
 	return (laystat);
 }
+

freebsd/sys/fs/nfsclient/nfs_clstate.c

@@ -5457,3 +5457,4 @@ tryagain:
 	NFSUNLOCKCLSTATE();
 	return (0);
 }
+

freebsd/sys/fs/nfsclient/nfs_clsubs.c

@@ -394,3 +394,4 @@ ncl_init(struct vfsconf *vfsp)
 
 	return (0);
 }
+

freebsd/sys/fs/nfsclient/nfs_clvfsops.c

@@ -2060,3 +2060,4 @@ void nfscl_retopts(struct nfsmount *nmp, char *buffer, size_t buflen)
 	nfscl_printoptval(nmp, nmp->nm_timeo, ",timeout", &buf, &blen);
 	nfscl_printoptval(nmp, nmp->nm_retry, ",retrans", &buf, &blen);
 }
+

freebsd/sys/fs/nfsclient/nfs_clvnops.c

@@ -3646,3 +3646,4 @@ nfs_pathconf(struct vop_pathconf_args *ap)
 	}
 	return (error);
 }
+

freebsd/sys/kern/kern_prot.c

@@ -1852,6 +1852,7 @@ crget(void)
 struct ucred *
 crhold(struct ucred *cr)
 {
+
 #ifdef __rtems__
 	if (cr == NULL)
 		return (cr);

freebsd/sys/kern/vfs_bio.c

@@ -2967,7 +2967,7 @@ vfs_vmio_invalidate(struct buf *bp)
 		BUF_CHECK_MAPPED(bp);
 #ifndef __rtems__
 		pmap_qremove(trunc_page((vm_offset_t)bp->b_data), bp->b_npages);
-#endif /* _-rtems__ */
+#endif /* __rtems__ */
 	} else
 		BUF_CHECK_UNMAPPED(bp);
 	/*

freebsd/sys/kern/vfs_export.c

@@ -538,3 +538,4 @@ vfs_stdcheckexp(struct mount *mp, struct sockaddr *nam, int *extflagsp,
 	lockmgr(&mp->mnt_explock, LK_RELEASE, NULL);
 	return (0);
 }
+

freebsd/sys/kern/vfs_syscalls.c

@@ -3536,7 +3536,6 @@ again:
 	    AUDITVNODE1, pathseg, old, oldfd,
 	    &cap_renameat_source_rights, td);
 #else
-
 	NDINIT_ATRIGHTS(&fromnd, DELETE, WANTPARENT | SAVESTART | AUDITVNODE1,
 	    pathseg, old, oldfd,
 	    &cap_renameat_source_rights, td);

freebsd/sys/kern/vfs_vnops.c

@@ -1252,7 +1252,6 @@ int
 vn_io_fault_uiomove(char *data, int xfersize, struct uio *uio)
 {
 #ifndef __rtems__
-	return (EFAULT);
 	struct uio transp_uio;
 	struct iovec transp_iov[1];
 	struct thread *td;

freebsd/sys/nfs/nfs_nfssvc.c

@@ -161,3 +161,4 @@ 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);
+

freebsd/sys/rpc/svc.c

@@ -1379,7 +1379,6 @@ svc_run(SVCPOOL *pool)
 #else /* __rtems__ */
 	pool->sp_proc = NULL;
 #endif /* __rtems__ */
-
 	/* Choose group count based on number of threads and CPUs. */
 	pool->sp_groupcount = max(1, min(SVC_MAXGROUPS,
 	    min(pool->sp_maxthreads / 2, mp_ncpus) / 6));

freebsd/sys/rpc/svc_auth.c

@@ -199,3 +199,4 @@ svc_getcred(struct svc_req *rqst, struct ucred **crp, int *flavorp)
 		return (FALSE);
 	}
 }
+