CVS commit: src/sys/fs/adosfs
Module Name:src Committed By: jdolecek Date: Thu Apr 23 09:58:37 UTC 2020 Modified Files: src/sys/fs/adosfs: advnops.c Log Message: fix obvious typo in error handling - buf error should go to b_error To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/fs/adosfs/advnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/adosfs
Module Name:src
Committed By: jdolecek
Date: Thu Apr 23 09:58:37 UTC 2020
Modified Files:
src/sys/fs/adosfs: advnops.c
Log Message:
fix obvious typo in error handling - buf error should go to b_error
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/fs/adosfs/advnops.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/adosfs/advnops.c
diff -u src/sys/fs/adosfs/advnops.c:1.51 src/sys/fs/adosfs/advnops.c:1.52
--- src/sys/fs/adosfs/advnops.c:1.51 Fri Jan 17 20:08:07 2020
+++ src/sys/fs/adosfs/advnops.c Thu Apr 23 09:58:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: advnops.c,v 1.51 2020/01/17 20:08:07 ad Exp $ */
+/* $NetBSD: advnops.c,v 1.52 2020/04/23 09:58:37 jdolecek Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.51 2020/01/17 20:08:07 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.52 2020/04/23 09:58:37 jdolecek Exp $");
#include
#include
@@ -387,7 +387,7 @@ adosfs_strategy(void *v)
if (bp->b_blkno == bp->b_lblkno) {
error = VOP_BMAP(vp, bp->b_lblkno, NULL, >b_blkno, NULL);
if (error) {
- bp->b_flags = error;
+ bp->b_error = error;
biodone(bp);
goto reterr;
}
CVS commit: src/sys/fs/adosfs
Module Name:src
Committed By: phx
Date: Wed Nov 18 22:06:25 UTC 2015
Modified Files:
src/sys/fs/adosfs: advfsops.c
Log Message:
Patch by hannken@ to fix a bug which has been introduced with 1.71.
The kernel crashed with uvm fault when mounting an ados file system.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/fs/adosfs/advfsops.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/adosfs/advfsops.c
diff -u src/sys/fs/adosfs/advfsops.c:1.74 src/sys/fs/adosfs/advfsops.c:1.75
--- src/sys/fs/adosfs/advfsops.c:1.74 Mon Apr 20 13:44:16 2015
+++ src/sys/fs/adosfs/advfsops.c Wed Nov 18 22:06:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.74 2015/04/20 13:44:16 riastradh Exp $ */
+/* $NetBSD: advfsops.c,v 1.75 2015/11/18 22:06:25 phx Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.74 2015/04/20 13:44:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.75 2015/11/18 22:06:25 phx Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -369,9 +369,12 @@ adosfs_statvfs(struct mount *mp, struct
int
adosfs_vget(struct mount *mp, ino_t an, struct vnode **vpp)
{
+ u_long block;
int error;
- error = vcache_get(mp, , sizeof(an), vpp);
+ block = an;
+ KASSERT(block == an);
+ error = vcache_get(mp, , sizeof(block), vpp);
if (error)
return error;
error = vn_lock(*vpp, LK_EXCLUSIVE);
@@ -394,7 +397,7 @@ adosfs_loadvnode(struct mount *mp, struc
struct adosfsmount *amp;
struct anode *ap;
struct buf *bp;
- ino_t an;
+ u_long an;
char *nam, *tmp;
int namlen, error;
CVS commit: src/sys/fs/adosfs
Module Name:src Committed By: phx Date: Wed Nov 18 22:06:25 UTC 2015 Modified Files: src/sys/fs/adosfs: advfsops.c Log Message: Patch by hannken@ to fix a bug which has been introduced with 1.71. The kernel crashed with uvm fault when mounting an ados file system. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/fs/adosfs/advfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/adosfs
Module Name:src
Committed By: hannken
Date: Tue Aug 5 08:50:54 UTC 2014
Modified Files:
src/sys/fs/adosfs: adosfs.h adutil.c advfsops.c advnops.c
Log Message:
Change adosfs from hashlist to vcache.
- point ap-block to real file header block for hard links.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/fs/adosfs/adosfs.h
cvs rdiff -u -r1.16 -r1.17 src/sys/fs/adosfs/adutil.c
cvs rdiff -u -r1.70 -r1.71 src/sys/fs/adosfs/advfsops.c
cvs rdiff -u -r1.44 -r1.45 src/sys/fs/adosfs/advnops.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/adosfs/adosfs.h
diff -u src/sys/fs/adosfs/adosfs.h:1.12 src/sys/fs/adosfs/adosfs.h:1.13
--- src/sys/fs/adosfs/adosfs.h:1.12 Wed Oct 3 07:20:50 2012
+++ src/sys/fs/adosfs/adosfs.h Tue Aug 5 08:50:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: adosfs.h,v 1.12 2012/10/03 07:20:50 mlelstv Exp $ */
+/* $NetBSD: adosfs.h,v 1.13 2014/08/05 08:50:54 hannken Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -73,7 +73,6 @@ enum anode_type { AROOT, ADIR, AFILE, AL
*/
struct anode {
struct genfs_node gnode;
- LIST_ENTRY(anode) link;
enum anode_type type;
char name[ADMAXNAMELEN+1]; /* (r/d/f) name for object */
struct datestamp mtimev; /* (r) volume modified */
@@ -112,7 +111,6 @@ struct anode {
#define ANODEHASHSZ (512)
struct adosfsmount {
- LIST_HEAD(anodechain, anode) anodetab[ANODEHASHSZ];
struct mount *mp; /* owner mount */
u_int32_t dostype; /* type of volume */
u_long rootb; /* root block number */
@@ -169,10 +167,6 @@ int adoshash(const u_char *, int, int, i
int adunixprot(int);
int adosfs_getblktype(struct adosfsmount *, struct buf *);
-struct vnode *adosfs_ahashget(struct mount *, ino_t);
-void adosfs_ainshash(struct adosfsmount *, struct anode *);
-void adosfs_aremhash(struct anode *);
-
int adosfs_lookup(void *);
extern int (**adosfs_vnodeop_p)(void *);
Index: src/sys/fs/adosfs/adutil.c
diff -u src/sys/fs/adosfs/adutil.c:1.16 src/sys/fs/adosfs/adutil.c:1.17
--- src/sys/fs/adosfs/adutil.c:1.16 Thu Feb 27 16:51:37 2014
+++ src/sys/fs/adosfs/adutil.c Tue Aug 5 08:50:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: adutil.c,v 1.16 2014/02/27 16:51:37 hannken Exp $ */
+/* $NetBSD: adutil.c,v 1.17 2014/08/05 08:50:54 hannken Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: adutil.c,v 1.16 2014/02/27 16:51:37 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: adutil.c,v 1.17 2014/08/05 08:50:54 hannken Exp $);
#include sys/param.h
#include sys/vnode.h
@@ -47,62 +47,8 @@ __KERNEL_RCSID(0, $NetBSD: adutil.c,v 1
/*
* look for anode in the mount's hash table, return locked.
*/
-#define AHASH(an) ((an) (ANODEHASHSZ - 1))
static int CapitalChar(int, int);
-extern kmutex_t adosfs_hashlock;
-
-struct vnode *
-adosfs_ahashget(struct mount *mp, ino_t an)
-{
- struct anodechain *hp;
- struct anode *ap;
- struct vnode *vp;
-
- hp = VFSTOADOSFS(mp)-anodetab[AHASH(an)];
-
-start_over:
- mutex_enter(adosfs_hashlock);
- for (ap = hp-lh_first; ap != NULL; ap = ap-link.le_next) {
- if (ap-block == an) {
- vp = ATOV(ap);
- mutex_enter(vp-v_interlock);
- mutex_exit(adosfs_hashlock);
- if (vget(vp, LK_EXCLUSIVE))
-goto start_over;
- return (ATOV(ap));
- }
- }
- mutex_exit(adosfs_hashlock);
- return (NULL);
-}
-
-/*
- * insert in hash table and lock
- *
- * ap-vp must have been initialized before this call.
- */
-void
-adosfs_ainshash(struct adosfsmount *amp, struct anode *ap)
-{
- int error __diagused;
-
- error = VOP_LOCK(ATOV(ap), LK_EXCLUSIVE);
- KASSERT(error == 0);
-
- mutex_enter(adosfs_hashlock);
- LIST_INSERT_HEAD(amp-anodetab[AHASH(ap-block)], ap, link);
- mutex_exit(adosfs_hashlock);
-}
-
-void
-adosfs_aremhash(struct anode *ap)
-{
- mutex_enter(adosfs_hashlock);
- LIST_REMOVE(ap, link);
- mutex_exit(adosfs_hashlock);
-}
-
int
adosfs_getblktype(struct adosfsmount *amp, struct buf *bp)
{
Index: src/sys/fs/adosfs/advfsops.c
diff -u src/sys/fs/adosfs/advfsops.c:1.70 src/sys/fs/adosfs/advfsops.c:1.71
--- src/sys/fs/adosfs/advfsops.c:1.70 Wed Apr 16 18:55:18 2014
+++ src/sys/fs/adosfs/advfsops.c Tue Aug 5 08:50:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.70 2014/04/16 18:55:18 maxv Exp $ */
+/* $NetBSD: advfsops.c,v 1.71 2014/08/05 08:50:54 hannken Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: advfsops.c,v 1.70 2014/04/16 18:55:18 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: advfsops.c,v 1.71 2014/08/05 08:50:54 hannken Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -70,8 +70,6 @@ static struct sysctllog *adosfs_sysctl_l
int adosfs_mountfs(struct vnode *, struct mount *, struct lwp *);
int adosfs_loadbitmap(struct adosfsmount *);
-kmutex_t adosfs_hashlock;
-
struct pool adosfs_node_pool;
CVS commit: src/sys/fs/adosfs
Module Name:src Committed By: hannken Date: Tue Aug 5 08:50:54 UTC 2014 Modified Files: src/sys/fs/adosfs: adosfs.h adutil.c advfsops.c advnops.c Log Message: Change adosfs from hashlist to vcache. - point ap-block to real file header block for hard links. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/fs/adosfs/adosfs.h cvs rdiff -u -r1.16 -r1.17 src/sys/fs/adosfs/adutil.c cvs rdiff -u -r1.70 -r1.71 src/sys/fs/adosfs/advfsops.c cvs rdiff -u -r1.44 -r1.45 src/sys/fs/adosfs/advnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/adosfs
Module Name:src
Committed By: mlelstv
Date: Wed Oct 3 07:20:50 UTC 2012
Modified Files:
src/sys/fs/adosfs: adosfs.h advfsops.c
Log Message:
Use getdisksize() to find out geometry, fetch only other magic values
from disklabel.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/fs/adosfs/adosfs.h
cvs rdiff -u -r1.64 -r1.65 src/sys/fs/adosfs/advfsops.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/adosfs/adosfs.h
diff -u src/sys/fs/adosfs/adosfs.h:1.11 src/sys/fs/adosfs/adosfs.h:1.12
--- src/sys/fs/adosfs/adosfs.h:1.11 Sun Aug 30 12:36:38 2009
+++ src/sys/fs/adosfs/adosfs.h Wed Oct 3 07:20:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: adosfs.h,v 1.11 2009/08/30 12:36:38 phx Exp $ */
+/* $NetBSD: adosfs.h,v 1.12 2012/10/03 07:20:50 mlelstv Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -116,7 +116,6 @@ struct adosfsmount {
struct mount *mp; /* owner mount */
u_int32_t dostype; /* type of volume */
u_long rootb; /* root block number */
- u_long secsperblk; /* sectors per block */
u_long bsize; /* size of blocks */
u_long nwords; /* size of blocks in long words */
u_long dbsize; /* data bytes per block */
Index: src/sys/fs/adosfs/advfsops.c
diff -u src/sys/fs/adosfs/advfsops.c:1.64 src/sys/fs/adosfs/advfsops.c:1.65
--- src/sys/fs/adosfs/advfsops.c:1.64 Tue Mar 13 18:40:35 2012
+++ src/sys/fs/adosfs/advfsops.c Wed Oct 3 07:20:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.64 2012/03/13 18:40:35 elad Exp $ */
+/* $NetBSD: advfsops.c,v 1.65 2012/10/03 07:20:50 mlelstv Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: advfsops.c,v 1.64 2012/03/13 18:40:35 elad Exp $);
+__KERNEL_RCSID(0, $NetBSD: advfsops.c,v 1.65 2012/10/03 07:20:50 mlelstv Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -48,6 +48,7 @@ __KERNEL_RCSID(0, $NetBSD: advfsops.c,v
#include sys/malloc.h
#include sys/pool.h
#include sys/disklabel.h
+#include sys/disk.h
#include miscfs/genfs/genfs.h
#include miscfs/specfs/specdev.h /* XXX */
#include sys/fcntl.h
@@ -166,45 +167,69 @@ adosfs_mountfs(struct vnode *devvp, stru
struct buf *bp;
struct vnode *rvp;
size_t bitmap_sz = 0;
- int error, part, i;
+ int error, i;
+ uint64_t numsecs;
+ unsigned secsize;
+ unsigned long secsperblk, blksperdisk, resvblks;
- part = DISKPART(devvp-v_rdev);
amp = NULL;
if ((error = vinvalbuf(devvp, V_SAVE, l-l_cred, l, 0, 0)) != 0)
return (error);
/*
- * open blkdev and read root block
+ * open blkdev and read boot and root block
*/
vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
if ((error = VOP_OPEN(devvp, FREAD, NOCRED)) != 0) {
VOP_UNLOCK(devvp);
return (error);
}
- error = VOP_IOCTL(devvp, DIOCGDINFO, dl, FREAD, NOCRED);
- VOP_UNLOCK(devvp);
+
+ error = getdisksize(devvp, numsecs, secsize);
if (error)
goto fail;
- parp = dl.d_partitions[part];
amp = kmem_zalloc(sizeof(struct adosfsmount), KM_SLEEP);
- amp-mp = mp;
+
+ /*
+ * compute filesystem parameters from disklabel
+ * on arch/amiga the disklabel is computed from the native
+ * partition tables
+ * - p_fsize is the filesystem block size
+ * - p_frag is the number of sectors per filesystem block
+ * - p_cpg is the number of reserved blocks (boot blocks)
+ * - p_psize is reduced by the number of preallocated blocks
+ * at the end of a partition
+ *
+ * XXX
+ * - bsize and secsperblk could be computed from the first sector
+ * of the root block
+ * - resvblks (the number of boot blocks) can only be guessed
+ * by scanning for the root block as its position moves
+ * with resvblks
+ */
+ error = VOP_IOCTL(devvp, DIOCGDINFO, dl, FREAD, NOCRED);
+ VOP_UNLOCK(devvp);
+ if (error)
+ goto fail;
+ parp = dl.d_partitions[DISKPART(devvp-v_rdev)];
if (dl.d_type == DTYPE_FLOPPY) {
- amp-bsize = dl.d_secsize;
- amp-secsperblk = 1;
- }
- else {
+ amp-bsize = secsize;
+ secsperblk = 1;
+ resvblks = 2;
+ } else if (parp-p_fsize 0 parp-p_frag 0) {
amp-bsize = parp-p_fsize * parp-p_frag;
- amp-secsperblk = parp-p_frag;
- }
-
- /* invalid fs ? */
- if (amp-secsperblk == 0) {
+ secsperblk = parp-p_frag;
+ resvblks = parp-p_cpg;
+ } else {
error = EINVAL;
goto fail;
}
+ blksperdisk = numsecs / secsperblk;
+
+ /* The filesytem variant ('dostype') is stored in the boot block */
bp = NULL;
if ((error = bread(devvp, (daddr_t)BBOFF,
amp-bsize, NOCRED, 0, bp)) != 0) {
@@ -220,20 +245,21 @@ adosfs_mountfs(struct vnode *devvp, stru
goto fail;
}
- amp-rootb = (parp-p_size / amp-secsperblk - 1 + parp-p_cpg) 1;
- amp-numblks = parp-p_size / amp-secsperblk - parp-p_cpg;
+ amp-rootb = (blksperdisk - 1 + resvblks) / 2;
+ amp-numblks = blksperdisk - resvblks;
amp-nwords = amp-bsize 2;
amp-dbsize = amp-bsize - (IS_FFS(amp) ? 0 : OFS_DATA_OFFSET);
CVS commit: src/sys/fs/adosfs
Module Name:src Committed By: mlelstv Date: Wed Oct 3 07:20:50 UTC 2012 Modified Files: src/sys/fs/adosfs: adosfs.h advfsops.c Log Message: Use getdisksize() to find out geometry, fetch only other magic values from disklabel. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/fs/adosfs/adosfs.h cvs rdiff -u -r1.64 -r1.65 src/sys/fs/adosfs/advfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/adosfs
Module Name:src
Committed By: phx
Date: Sun Aug 30 12:36:38 UTC 2009
Modified Files:
src/sys/fs/adosfs: adosfs.h advfsops.c advnops.c
Log Message:
Fixed fatal warnings with ADOSFS_DIAGNOSTIC.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/fs/adosfs/adosfs.h
cvs rdiff -u -r1.58 -r1.59 src/sys/fs/adosfs/advfsops.c
cvs rdiff -u -r1.35 -r1.36 src/sys/fs/adosfs/advnops.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/adosfs/adosfs.h
diff -u src/sys/fs/adosfs/adosfs.h:1.10 src/sys/fs/adosfs/adosfs.h:1.11
--- src/sys/fs/adosfs/adosfs.h:1.10 Sat Mar 14 14:46:09 2009
+++ src/sys/fs/adosfs/adosfs.h Sun Aug 30 12:36:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adosfs.h,v 1.10 2009/03/14 14:46:09 dsl Exp $ */
+/* $NetBSD: adosfs.h,v 1.11 2009/08/30 12:36:38 phx Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -178,5 +178,8 @@
extern int (**adosfs_vnodeop_p)(void *);
+/* Should print a vnode or the vnode-op's arguments? */
+#define advopprint(p) /* XXX */
+
#endif /* _KERNEL */
#endif /* _ADOSFS_ADOSFS_H_ */
Index: src/sys/fs/adosfs/advfsops.c
diff -u src/sys/fs/adosfs/advfsops.c:1.58 src/sys/fs/adosfs/advfsops.c:1.59
--- src/sys/fs/adosfs/advfsops.c:1.58 Mon Jun 29 05:08:17 2009
+++ src/sys/fs/adosfs/advfsops.c Sun Aug 30 12:36:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.58 2009/06/29 05:08:17 dholland Exp $ */
+/* $NetBSD: advfsops.c,v 1.59 2009/08/30 12:36:38 phx Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: advfsops.c,v 1.58 2009/06/29 05:08:17 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: advfsops.c,v 1.59 2009/08/30 12:36:38 phx Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -673,7 +673,7 @@
return EINVAL;
#ifdef ADOSFS_DIAGNOSTIC
- printf(adfhtovp(%x, %x, %x)\n, mp, fhp, vpp);
+ printf(adfhtovp(%p, %p, %p)\n, mp, fhp, vpp);
#endif
memcpy(ifh, fhp, sizeof(ifh));
@@ -713,7 +713,7 @@
memcpy(fhp, ifh, sizeof(ifh));
#ifdef ADOSFS_DIAGNOSTIC
- printf(advptofh(%x, %x)\n, vp, fhp);
+ printf(advptofh(%p, %p)\n, vp, fhp);
#endif
return(0);
}
@@ -722,7 +722,7 @@
adosfs_sync(struct mount *mp, int waitfor, kauth_cred_t uc)
{
#ifdef ADOSFS_DIAGNOSTIC
- printf(ad_sync(%x, %x)\n, mp, waitfor);
+ printf(ad_sync(%p, %d)\n, mp, waitfor);
#endif
return(0);
}
Index: src/sys/fs/adosfs/advnops.c
diff -u src/sys/fs/adosfs/advnops.c:1.35 src/sys/fs/adosfs/advnops.c:1.36
--- src/sys/fs/adosfs/advnops.c:1.35 Fri Jul 3 21:17:40 2009
+++ src/sys/fs/adosfs/advnops.c Sun Aug 30 12:36:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: advnops.c,v 1.35 2009/07/03 21:17:40 elad Exp $ */
+/* $NetBSD: advnops.c,v 1.36 2009/08/30 12:36:38 phx Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: advnops.c,v 1.35 2009/07/03 21:17:40 elad Exp $);
+__KERNEL_RCSID(0, $NetBSD: advnops.c,v 1.36 2009/08/30 12:36:38 phx Exp $);
#include sys/param.h
#include sys/systm.h
@@ -342,6 +342,7 @@
adosfs_write(void *v)
{
#ifdef ADOSFS_DIAGNOSTIC
+#if 0
struct vop_write_args /* {
struct vnode *a_vp;
struct uio *a_uio;
@@ -349,6 +350,7 @@
kauth_cred_t a_cred;
} */ *sp = v;
advopprint(sp);
+#endif
printf( EOPNOTSUPP));
#endif
return(EOPNOTSUPP);
