rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-15 13:32:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

vfs/nfs: Revert white space changes

Browse Source
This commit is contained in:
Sebastian Huber
2023-01-05 17:42:48 +01:00
parent 84d15c21e6
commit 6e4709be52
20 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
freebsd/sys/fs/nfs/nfs_commonkrpc.c
View File

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

1
freebsd/sys/fs/nfs/nfs_commonport.c
View File

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

1
freebsd/sys/fs/nfs/nfs_commonsubs.c
View File

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

3
freebsd/sys/fs/nfsclient/nfs.h
View File

@@ -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
nfsmount *, struct buf *, struct ucred *,
int ncl_asyncio(struct nfsmount *, struct buf *, struct ucred *,
struct thread *);
int ncl_doio(struct vnode *, struct buf *, struct ucred *, struct thread *,
int);

3
freebsd/sys/fs/nfsclient/nfs_clbio.c
View File

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

1
freebsd/sys/fs/nfsclient/nfs_clkrpc.c
View File

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

1
freebsd/sys/fs/nfsclient/nfs_clport.c
View File

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

1
freebsd/sys/fs/nfsclient/nfs_clrpcops.c
View File

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

1
freebsd/sys/fs/nfsclient/nfs_clstate.c
View File

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

1
freebsd/sys/fs/nfsclient/nfs_clsubs.c
View File

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

1
freebsd/sys/fs/nfsclient/nfs_clvfsops.c
View File

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

1
freebsd/sys/fs/nfsclient/nfs_clvnops.c
View File

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

1
freebsd/sys/kern/kern_prot.c
View File

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

2
freebsd/sys/kern/vfs_bio.c
View File

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

1
freebsd/sys/kern/vfs_export.c
View File

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

1
freebsd/sys/kern/vfs_syscalls.c
View File

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

1
freebsd/sys/kern/vfs_vnops.c
View File

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

1
freebsd/sys/nfs/nfs_nfssvc.c
View File

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

1
freebsd/sys/rpc/svc.c
View File

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

1
freebsd/sys/rpc/svc_auth.c
View File

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