sync with OpenBSD -current

This commit is contained in:
purplerain 2024-03-26 02:17:23 +00:00
parent fa20b4dfa4
commit 56a087cff9
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
61 changed files with 2001 additions and 1682 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: nfs_serv.c,v 1.122 2023/03/08 04:43:09 guenther Exp $ */
/* $OpenBSD: nfs_serv.c,v 1.123 2024/03/25 17:57:07 guenther Exp $ */
/* $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $ */
/*
@ -1598,7 +1598,7 @@ nfsrv_link(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
error = 0;
goto nfsmout;
}
if (vp->v_type == VDIR && (error = suser_ucred(cred)) != 0)
if (vp->v_type == VDIR)
goto out1;
NDINIT(&nd, CREATE, LOCKPARENT, UIO_SYSSPACE, NULL, procp);

View file

@ -1,4 +1,4 @@
/* $OpenBSD: nfs_vnops.c,v 1.193 2023/04/26 10:00:37 beck Exp $ */
/* $OpenBSD: nfs_vnops.c,v 1.194 2024/03/25 17:57:07 guenther Exp $ */
/* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */
/*
@ -1769,11 +1769,6 @@ nfs_link(void *v)
info.nmi_v3 = NFS_ISV3(vp);
if (dvp->v_mount != vp->v_mount) {
pool_put(&namei_pool, cnp->cn_pnbuf);
vput(dvp);
return (EXDEV);
}
error = vn_lock(vp, LK_EXCLUSIVE);
if (error != 0) {
VOP_ABORTOP(dvp, cnp);