Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/fs/msdosfs Use genfs instead of homegrown stuff where po...



details:   https://anonhg.NetBSD.org/src/rev/fc899b86c8e0
branches:  trunk
changeset: 753734:fc899b86c8e0
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Apr 08 15:03:33 2010 +0000

description:
Use genfs instead of homegrown stuff where possible.

diffstat:

 sys/fs/msdosfs/denode.h        |   4 +---
 sys/fs/msdosfs/msdosfs_vnops.c |  39 ++++-----------------------------------
 2 files changed, 5 insertions(+), 38 deletions(-)

diffs (106 lines):

diff -r 6babb32d033f -r fc899b86c8e0 sys/fs/msdosfs/denode.h
--- a/sys/fs/msdosfs/denode.h   Thu Apr 08 12:36:21 2010 +0000
+++ b/sys/fs/msdosfs/denode.h   Thu Apr 08 15:03:33 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: denode.h,v 1.16 2007/11/26 19:01:46 pooka Exp $        */
+/*     $NetBSD: denode.h,v 1.17 2010/04/08 15:03:33 pooka Exp $        */
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -260,7 +260,6 @@
 int    msdosfs_lookup          (void *);
 int    msdosfs_create          (void *);
 int    msdosfs_mknod           (void *);
-int    msdosfs_open            (void *);
 int    msdosfs_close           (void *);
 int    msdosfs_access          (void *);
 int    msdosfs_getattr         (void *);
@@ -281,7 +280,6 @@
 int    msdosfs_rmdir           (void *);
 int    msdosfs_symlink         (void *);
 int    msdosfs_readdir         (void *);
-int    msdosfs_readlink        (void *);
 #define        msdosfs_abortop         genfs_abortop
 int    msdosfs_inactive        (void *);
 int    msdosfs_reclaim         (void *);
diff -r 6babb32d033f -r fc899b86c8e0 sys/fs/msdosfs/msdosfs_vnops.c
--- a/sys/fs/msdosfs/msdosfs_vnops.c    Thu Apr 08 12:36:21 2010 +0000
+++ b/sys/fs/msdosfs/msdosfs_vnops.c    Thu Apr 08 15:03:33 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdosfs_vnops.c,v 1.61 2009/07/03 21:17:40 elad Exp $  */
+/*     $NetBSD: msdosfs_vnops.c,v 1.62 2010/04/08 15:03:33 pooka Exp $ */
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.61 2009/07/03 21:17:40 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.62 2010/04/08 15:03:33 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -186,20 +186,6 @@
 }
 
 int
-msdosfs_open(void *v)
-{
-#if 0
-       struct vop_open_args /* {
-               struct vnode *a_vp;
-               int a_mode;
-               kauth_cred_t a_cred;
-       } */ *ap;
-#endif
-
-       return (0);
-}
-
-int
 msdosfs_close(void *v)
 {
        struct vop_close_args /* {
@@ -1685,23 +1671,6 @@
 }
 
 /*
- * DOS filesystems don't know what symlinks are.
- */
-int
-msdosfs_readlink(void *v)
-{
-#if 0
-       struct vop_readlink_args /* {
-               struct vnode *a_vp;
-               struct uio *a_uio;
-               kauth_cred_t a_cred;
-       } */ *ap;
-#endif
-
-       return (EINVAL);
-}
-
-/*
  * vp  - address of vnode file the file
  * bn  - which cluster we are interested in mapping to a filesystem block number.
  * vpp - returns the vnode for the block special file holding the filesystem
@@ -1946,7 +1915,7 @@
        { &vop_lookup_desc, msdosfs_lookup },           /* lookup */
        { &vop_create_desc, msdosfs_create },           /* create */
        { &vop_mknod_desc, msdosfs_mknod },             /* mknod */
-       { &vop_open_desc, msdosfs_open },               /* open */
+       { &vop_open_desc, genfs_nullop },               /* open */
        { &vop_close_desc, msdosfs_close },             /* close */
        { &vop_access_desc, msdosfs_access },           /* access */
        { &vop_getattr_desc, msdosfs_getattr },         /* getattr */
@@ -1968,7 +1937,7 @@
        { &vop_rmdir_desc, msdosfs_rmdir },             /* rmdir */
        { &vop_symlink_desc, msdosfs_symlink },         /* symlink */
        { &vop_readdir_desc, msdosfs_readdir },         /* readdir */
-       { &vop_readlink_desc, msdosfs_readlink },       /* readlink */
+       { &vop_readlink_desc, genfs_einval },           /* readlink */
        { &vop_abortop_desc, msdosfs_abortop },         /* abortop */
        { &vop_inactive_desc, msdosfs_inactive },       /* inactive */
        { &vop_reclaim_desc, msdosfs_reclaim },         /* reclaim */



Home | Main Index | Thread Index | Old Index