Attachment 7873 Details for Bug 16815 – file.diff

[patch] file.diff

file.diff (text/plain), 1.13 KB, created by Jun Kuriyama on 2000-02-19 03:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jun Kuriyama

Created: 2000-02-19 03:20:01 UTC

Size: 1.13 KB

patch

obsolete

>Index: nfs_vnops.c
>===================================================================
>RCS file: /home/ncvs/src/sys/nfs/nfs_vnops.c,v
>retrieving revision 1.150
>diff -u -r1.150 nfs_vnops.c
>--- nfs_vnops.c	2000/01/05 00:32:18	1.150
>+++ nfs_vnops.c	2000/02/15 15:49:39
>@@ -820,9 +820,6 @@
> 	struct proc *p = cnp->cn_proc;
> 
> 	*vpp = NULLVP;
>-	if ((flags & ISLASTCN) && (dvp->v_mount->mnt_flag & MNT_RDONLY) &&
>-	    (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME))
>-		return (EROFS);
> 	if (dvp->v_type != VDIR)
> 		return (ENOTDIR);
> 	lockparent = flags & LOCKPARENT;
>@@ -833,6 +830,11 @@
> 		struct vattr vattr;
> 		int vpid;
> 
>+		if ((flags & ISLASTCN) &&
>+		    (dvp->v_mount->mnt_flag & MNT_RDONLY) &&
>+		    (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME))
>+			return (EROFS);
>+
> 		if ((error = VOP_ACCESS(dvp, VEXEC, cnp->cn_cred, p)) != 0) {
> 			*vpp = NULLVP;
> 			return (error);
>@@ -894,6 +896,10 @@
> 		goto nfsmout;
> 	}
> 	nfsm_getfh(fhp, fhsize, v3);
>+
>+	if ((flags & ISLASTCN) && (dvp->v_mount->mnt_flag & MNT_RDONLY) &&
>+	    (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME))
>+		return (EROFS);
> 
> 	/*
> 	 * Handle RENAME case...

Actions: View | Diff

Attachments on bug 16815: 7873