Module Name: src
Committed By: riz
Date: Sun Nov 21 18:46:40 UTC 2010
Modified Files:
src/sys/fs/msdosfs [netbsd-5]: msdosfs_lookup.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1434):
sys/fs/msdosfs/msdosfs_lookup.c: revision 1.22
Return EINVAL for rename and delete operations to the
root directory instead of the erroneous EROFS.
To generate a diff of this commit:
cvs rdiff -u -r1.16.8.1 -r1.16.8.2 src/sys/fs/msdosfs/msdosfs_lookup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_lookup.c
diff -u src/sys/fs/msdosfs/msdosfs_lookup.c:1.16.8.1 src/sys/fs/msdosfs/msdosfs_lookup.c:1.16.8.2
--- src/sys/fs/msdosfs/msdosfs_lookup.c:1.16.8.1 Mon Feb 2 20:42:44 2009
+++ src/sys/fs/msdosfs/msdosfs_lookup.c Sun Nov 21 18:46:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_lookup.c,v 1.16.8.1 2009/02/02 20:42:44 snj Exp $ */
+/* $NetBSD: msdosfs_lookup.c,v 1.16.8.2 2010/11/21 18:46:40 riz Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.16.8.1 2009/02/02 20:42:44 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.16.8.2 2010/11/21 18:46:40 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -462,7 +462,7 @@
* Don't allow deleting the root.
*/
if (blkoff == MSDOSFSROOT_OFS)
- return EROFS; /* really? XXX */
+ return EINVAL;
/*
* Write access to directory required to delete files.
@@ -498,7 +498,7 @@
return (EROFS);
if (blkoff == MSDOSFSROOT_OFS)
- return EROFS; /* really? XXX */
+ return EINVAL;
error = VOP_ACCESS(vdp, VWRITE, cnp->cn_cred);
if (error)
