Source-Changes-HG archive

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

[src/trunk]: src/sys Stop exposing fifofs internals and leave only fifo_vnode...



details:   https://anonhg.NetBSD.org/src/rev/3ebca86a7083
branches:  trunk
changeset: 753457:3ebca86a7083
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Mar 29 13:11:32 2010 +0000

description:
Stop exposing fifofs internals and leave only fifo_vnodeop_p visible.

diffstat:

 sys/fs/cd9660/cd9660_vnops.c   |   60 +++++++-------
 sys/fs/efs/efs_vnops.c         |   58 +++++++-------
 sys/fs/hfs/hfs_vnops.c         |   66 ++++++++--------
 sys/fs/puffs/puffs_vnops.c     |   62 ++++++++--------
 sys/fs/tmpfs/tmpfs_fifoops.h   |   52 ++++++------
 sys/fs/tmpfs/tmpfs_vnops.c     |    6 +-
 sys/kern/vfs_vnops.c           |   13 ++-
 sys/miscfs/fifofs/fifo.h       |   46 +-----------
 sys/miscfs/fifofs/fifo_vnops.c |  155 +++++++++++++++++++++-------------------
 sys/nfs/nfs_vnops.c            |   52 ++++++------
 sys/sys/vnode.h                |    3 +-
 sys/ufs/ext2fs/ext2fs_vnops.c  |   52 ++++++------
 sys/ufs/ffs/ffs_vnops.c        |   52 ++++++------
 sys/ufs/lfs/lfs_vnops.c        |   54 +++++++-------
 sys/ufs/ufs/ufs_vnops.c        |    6 +-
 15 files changed, 354 insertions(+), 383 deletions(-)

diffs (truncated from 1266 to 300 lines):

diff -r 15e1cd7edcc3 -r 3ebca86a7083 sys/fs/cd9660/cd9660_vnops.c
--- a/sys/fs/cd9660/cd9660_vnops.c      Mon Mar 29 11:39:45 2010 +0000
+++ b/sys/fs/cd9660/cd9660_vnops.c      Mon Mar 29 13:11:32 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd9660_vnops.c,v 1.38 2009/07/03 21:17:40 elad Exp $   */
+/*     $NetBSD: cd9660_vnops.c,v 1.39 2010/03/29 13:11:32 pooka Exp $  */
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.38 2009/07/03 21:17:40 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.39 2010/03/29 13:11:32 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -948,45 +948,45 @@
 int (**cd9660_fifoop_p)(void *);
 const struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
        { &vop_default_desc, vn_default_error },
-       { &vop_lookup_desc, fifo_lookup },              /* lookup */
-       { &vop_create_desc, fifo_create },              /* create */
-       { &vop_mknod_desc, fifo_mknod },                /* mknod */
-       { &vop_open_desc, fifo_open },                  /* open */
-       { &vop_close_desc, fifo_close },                /* close */
+       { &vop_lookup_desc, vn_fifo_bypass },           /* lookup */
+       { &vop_create_desc, vn_fifo_bypass },           /* create */
+       { &vop_mknod_desc, vn_fifo_bypass },            /* mknod */
+       { &vop_open_desc, vn_fifo_bypass },             /* open */
+       { &vop_close_desc, vn_fifo_bypass },            /* close */
        { &vop_access_desc, cd9660_access },            /* access */
        { &vop_getattr_desc, cd9660_getattr },          /* getattr */
        { &vop_setattr_desc, cd9660_setattr },          /* setattr */
-       { &vop_read_desc, fifo_read },                  /* read */
-       { &vop_write_desc, fifo_write },                /* write */
+       { &vop_read_desc, vn_fifo_bypass },             /* read */
+       { &vop_write_desc, vn_fifo_bypass },            /* write */
        { &vop_fcntl_desc, genfs_fcntl },               /* fcntl */
-       { &vop_ioctl_desc, fifo_ioctl },                /* ioctl */
-       { &vop_poll_desc, fifo_poll },                  /* poll */
-       { &vop_kqfilter_desc, fifo_kqfilter },          /* kqfilter */
-       { &vop_revoke_desc, fifo_revoke },              /* revoke */
-       { &vop_mmap_desc, fifo_mmap },                  /* mmap */
-       { &vop_fsync_desc, fifo_fsync },                /* fsync */
-       { &vop_seek_desc, fifo_seek },                  /* seek */
-       { &vop_remove_desc, fifo_remove },              /* remove */
-       { &vop_link_desc, fifo_link }   ,               /* link */
-       { &vop_rename_desc, fifo_rename },              /* rename */
-       { &vop_mkdir_desc, fifo_mkdir },                /* mkdir */
-       { &vop_rmdir_desc, fifo_rmdir },                /* rmdir */
-       { &vop_symlink_desc, fifo_symlink },            /* symlink */
-       { &vop_readdir_desc, fifo_readdir },            /* readdir */
-       { &vop_readlink_desc, fifo_readlink },          /* readlink */
-       { &vop_abortop_desc, fifo_abortop },            /* abortop */
+       { &vop_ioctl_desc, vn_fifo_bypass },            /* ioctl */
+       { &vop_poll_desc, vn_fifo_bypass },             /* poll */
+       { &vop_kqfilter_desc, vn_fifo_bypass },         /* kqfilter */
+       { &vop_revoke_desc, vn_fifo_bypass },           /* revoke */
+       { &vop_mmap_desc, vn_fifo_bypass },             /* mmap */
+       { &vop_fsync_desc, vn_fifo_bypass },            /* fsync */
+       { &vop_seek_desc, vn_fifo_bypass },             /* seek */
+       { &vop_remove_desc, vn_fifo_bypass },           /* remove */
+       { &vop_link_desc, vn_fifo_bypass } ,            /* link */
+       { &vop_rename_desc, vn_fifo_bypass },           /* rename */
+       { &vop_mkdir_desc, vn_fifo_bypass },            /* mkdir */
+       { &vop_rmdir_desc, vn_fifo_bypass },            /* rmdir */
+       { &vop_symlink_desc, vn_fifo_bypass },          /* symlink */
+       { &vop_readdir_desc, vn_fifo_bypass },          /* readdir */
+       { &vop_readlink_desc, vn_fifo_bypass },         /* readlink */
+       { &vop_abortop_desc, vn_fifo_bypass },          /* abortop */
        { &vop_inactive_desc, cd9660_inactive },        /* inactive */
        { &vop_reclaim_desc, cd9660_reclaim },          /* reclaim */
        { &vop_lock_desc, genfs_lock },                 /* lock */
        { &vop_unlock_desc, genfs_unlock },             /* unlock */
-       { &vop_bmap_desc, fifo_bmap },                  /* bmap */
-       { &vop_strategy_desc, fifo_strategy },          /* strategy */
+       { &vop_bmap_desc, vn_fifo_bypass },             /* bmap */
+       { &vop_strategy_desc, vn_fifo_bypass },         /* strategy */
        { &vop_print_desc, cd9660_print },              /* print */
        { &vop_islocked_desc, genfs_islocked },         /* islocked */
-       { &vop_pathconf_desc, fifo_pathconf },          /* pathconf */
-       { &vop_advlock_desc, fifo_advlock },            /* advlock */
+       { &vop_pathconf_desc, vn_fifo_bypass },         /* pathconf */
+       { &vop_advlock_desc, vn_fifo_bypass },          /* advlock */
        { &vop_bwrite_desc, vn_bwrite },                /* bwrite */
-       { &vop_putpages_desc, fifo_putpages },          /* putpages */
+       { &vop_putpages_desc, vn_fifo_bypass },         /* putpages */
        { NULL, NULL }
 };
 const struct vnodeopv_desc cd9660_fifoop_opv_desc =
diff -r 15e1cd7edcc3 -r 3ebca86a7083 sys/fs/efs/efs_vnops.c
--- a/sys/fs/efs/efs_vnops.c    Mon Mar 29 11:39:45 2010 +0000
+++ b/sys/fs/efs/efs_vnops.c    Mon Mar 29 13:11:32 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: efs_vnops.c,v 1.20 2009/07/03 22:25:51 pooka Exp $     */
+/*     $NetBSD: efs_vnops.c,v 1.21 2010/03/29 13:11:32 pooka Exp $     */
 
 /*
  * Copyright (c) 2006 Stephen M. Rumble <rumble%ephemeral.org@localhost>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.20 2009/07/03 22:25:51 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.21 2010/03/29 13:11:32 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -910,42 +910,42 @@
 int (**efs_fifoop_p)(void *);
 const struct vnodeopv_entry_desc efs_fifoop_entries[] = {
        { &vop_default_desc,    vn_default_error},      /* error handler */
-       { &vop_lookup_desc,     fifo_lookup     },      /* lookup */
-       { &vop_create_desc,     fifo_create     },      /* create */
-       { &vop_mknod_desc,      fifo_mknod      },      /* mknod */
-       { &vop_open_desc,       fifo_open       },      /* open */
-       { &vop_close_desc,      fifo_close      },      /* close */
+       { &vop_lookup_desc,     vn_fifo_bypass  },      /* lookup */
+       { &vop_create_desc,     vn_fifo_bypass  },      /* create */
+       { &vop_mknod_desc,      vn_fifo_bypass  },      /* mknod */
+       { &vop_open_desc,       vn_fifo_bypass  },      /* open */
+       { &vop_close_desc,      vn_fifo_bypass  },      /* close */
        { &vop_access_desc,     efs_access      },      /* access */
        { &vop_getattr_desc,    efs_getattr     },      /* getattr */
        { &vop_setattr_desc,    genfs_eopnotsupp},      /* setattr */
-       { &vop_read_desc,       fifo_read       },      /* read */
-       { &vop_write_desc,      fifo_write      },      /* write */
-       { &vop_ioctl_desc,      fifo_ioctl      },      /* ioctl */
+       { &vop_read_desc,       vn_fifo_bypass  },      /* read */
+       { &vop_write_desc,      vn_fifo_bypass  },      /* write */
+       { &vop_ioctl_desc,      vn_fifo_bypass  },      /* ioctl */
        { &vop_fcntl_desc,      genfs_fcntl     },      /* fcntl */
-       { &vop_poll_desc,       fifo_poll       },      /* poll */
-       { &vop_kqfilter_desc,   fifo_kqfilter   },      /* kqfilter */
-       { &vop_revoke_desc,     fifo_revoke     },      /* revoke */
-       { &vop_mmap_desc,       fifo_mmap       },      /* mmap */
-       { &vop_fsync_desc,      fifo_fsync      },      /* fsync */
-       { &vop_seek_desc,       fifo_seek       },      /* seek */
-       { &vop_remove_desc,     fifo_remove     },      /* remove */
-       { &vop_link_desc,       fifo_link       },      /* link */
-       { &vop_rename_desc,     fifo_rename     },      /* rename */
-       { &vop_mkdir_desc,      fifo_mkdir      },      /* mkdir */
-       { &vop_rmdir_desc,      fifo_rmdir      },      /* rmdir */
-       { &vop_symlink_desc,    fifo_symlink    },      /* symlink */
-       { &vop_readdir_desc,    fifo_readdir    },      /* readdir */
-       { &vop_readlink_desc,   fifo_readlink   },      /* readlink */
-       { &vop_abortop_desc,    fifo_abortop    },      /* abortop */
+       { &vop_poll_desc,       vn_fifo_bypass  },      /* poll */
+       { &vop_kqfilter_desc,   vn_fifo_bypass  },      /* kqfilter */
+       { &vop_revoke_desc,     vn_fifo_bypass  },      /* revoke */
+       { &vop_mmap_desc,       vn_fifo_bypass  },      /* mmap */
+       { &vop_fsync_desc,      vn_fifo_bypass  },      /* fsync */
+       { &vop_seek_desc,       vn_fifo_bypass  },      /* seek */
+       { &vop_remove_desc,     vn_fifo_bypass  },      /* remove */
+       { &vop_link_desc,       vn_fifo_bypass  },      /* link */
+       { &vop_rename_desc,     vn_fifo_bypass  },      /* rename */
+       { &vop_mkdir_desc,      vn_fifo_bypass  },      /* mkdir */
+       { &vop_rmdir_desc,      vn_fifo_bypass  },      /* rmdir */
+       { &vop_symlink_desc,    vn_fifo_bypass  },      /* symlink */
+       { &vop_readdir_desc,    vn_fifo_bypass  },      /* readdir */
+       { &vop_readlink_desc,   vn_fifo_bypass  },      /* readlink */
+       { &vop_abortop_desc,    vn_fifo_bypass  },      /* abortop */
        { &vop_inactive_desc,   efs_inactive    },      /* inactive */
        { &vop_reclaim_desc,    efs_reclaim     },      /* reclaim */
        { &vop_lock_desc,       genfs_lock,     },      /* lock */
        { &vop_unlock_desc,     genfs_unlock,   },      /* unlock */
        { &vop_islocked_desc,   genfs_islocked, },      /* islocked */
-       { &vop_bmap_desc,       fifo_bmap       },      /* bmap */
+       { &vop_bmap_desc,       vn_fifo_bypass  },      /* bmap */
        { &vop_print_desc,      efs_print       },      /* print */
-       { &vop_pathconf_desc,   fifo_pathconf   },      /* pathconf */
-       { &vop_advlock_desc,    fifo_advlock    },      /* advlock */
+       { &vop_pathconf_desc,   vn_fifo_bypass  },      /* pathconf */
+       { &vop_advlock_desc,    vn_fifo_bypass  },      /* advlock */
                                                        /* blkatoff */
                                                        /* valloc */
                                                        /* balloc */
@@ -953,7 +953,7 @@
                                                        /* truncate */
                                                        /* whiteout */
        { &vop_bwrite_desc,     vn_bwrite       },      /* bwrite */
-       { &vop_strategy_desc,   fifo_strategy   },      /* strategy */
+       { &vop_strategy_desc,   vn_fifo_bypass  },      /* strategy */
        { NULL, NULL }
 };
 const struct vnodeopv_desc efs_fifoop_opv_desc = {
diff -r 15e1cd7edcc3 -r 3ebca86a7083 sys/fs/hfs/hfs_vnops.c
--- a/sys/fs/hfs/hfs_vnops.c    Mon Mar 29 11:39:45 2010 +0000
+++ b/sys/fs/hfs/hfs_vnops.c    Mon Mar 29 13:11:32 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hfs_vnops.c,v 1.16 2010/01/08 11:35:08 pooka Exp $     */
+/*     $NetBSD: hfs_vnops.c,v 1.17 2010/03/29 13:11:33 pooka Exp $     */
 
 /*-
  * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.16 2010/01/08 11:35:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.17 2010/03/29 13:11:33 pooka Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -259,45 +259,45 @@
 int (**hfs_fifoop_p) (void *);
 const struct vnodeopv_entry_desc hfs_fifoop_entries[] = {
        { &vop_default_desc, vn_default_error },
-       { &vop_lookup_desc, fifo_lookup },              /* lookup */
-       { &vop_create_desc, fifo_create },              /* create */
-       { &vop_mknod_desc, fifo_mknod },                /* mknod */
-       { &vop_open_desc, fifo_open },                  /* open */
-       { &vop_close_desc, fifo_close },                /* close */
+       { &vop_lookup_desc, vn_fifo_bypass },           /* lookup */
+       { &vop_create_desc, vn_fifo_bypass },           /* create */
+       { &vop_mknod_desc, vn_fifo_bypass },            /* mknod */
+       { &vop_open_desc, vn_fifo_bypass },             /* open */
+       { &vop_close_desc, vn_fifo_bypass },            /* close */
        { &vop_access_desc, hfs_vop_access },           /* access */
-       { &vop_getattr_desc, hfs_vop_getattr }, /* getattr */
-       { &vop_setattr_desc, hfs_vop_setattr }, /* setattr */
-       { &vop_read_desc, fifo_read },                  /* read */
-       { &vop_write_desc, fifo_write },                /* write */
-       { &vop_ioctl_desc, fifo_ioctl },                /* ioctl */
+       { &vop_getattr_desc, hfs_vop_getattr },         /* getattr */
+       { &vop_setattr_desc, hfs_vop_setattr },         /* setattr */
+       { &vop_read_desc, vn_fifo_bypass },             /* read */
+       { &vop_write_desc, vn_fifo_bypass },            /* write */
+       { &vop_ioctl_desc, vn_fifo_bypass },            /* ioctl */
        { &vop_fcntl_desc, genfs_fcntl },               /* fcntl */
-       { &vop_poll_desc, fifo_poll },                  /* poll */
-       { &vop_kqfilter_desc, fifo_kqfilter },          /* kqfilter */
-       { &vop_revoke_desc, fifo_revoke },              /* revoke */
-       { &vop_mmap_desc, fifo_mmap },                  /* mmap */
-       { &vop_fsync_desc, fifo_fsync },                /* fsync */
-       { &vop_seek_desc, fifo_seek },                  /* seek */
-       { &vop_remove_desc, fifo_remove },              /* remove */
-       { &vop_link_desc, fifo_link },                  /* link */
-       { &vop_rename_desc, fifo_rename },              /* rename */
-       { &vop_mkdir_desc, fifo_mkdir },                /* mkdir */
-       { &vop_rmdir_desc, fifo_rmdir },                /* rmdir */
-       { &vop_symlink_desc, fifo_symlink },            /* symlink */
-       { &vop_readdir_desc, fifo_readdir },            /* readdir */
-       { &vop_readlink_desc, fifo_readlink },          /* readlink */
-       { &vop_abortop_desc, fifo_abortop },            /* abortop */
+       { &vop_poll_desc, vn_fifo_bypass },             /* poll */
+       { &vop_kqfilter_desc, vn_fifo_bypass },         /* kqfilter */
+       { &vop_revoke_desc, vn_fifo_bypass },           /* revoke */
+       { &vop_mmap_desc, vn_fifo_bypass },             /* mmap */
+       { &vop_fsync_desc, vn_fifo_bypass },            /* fsync */
+       { &vop_seek_desc, vn_fifo_bypass },             /* seek */
+       { &vop_remove_desc, vn_fifo_bypass },           /* remove */
+       { &vop_link_desc, vn_fifo_bypass },             /* link */
+       { &vop_rename_desc, vn_fifo_bypass },           /* rename */
+       { &vop_mkdir_desc, vn_fifo_bypass },            /* mkdir */
+       { &vop_rmdir_desc, vn_fifo_bypass },            /* rmdir */
+       { &vop_symlink_desc, vn_fifo_bypass },          /* symlink */
+       { &vop_readdir_desc, vn_fifo_bypass },          /* readdir */
+       { &vop_readlink_desc, vn_fifo_bypass },         /* readlink */
+       { &vop_abortop_desc, vn_fifo_bypass },          /* abortop */
        { &vop_inactive_desc, genfs_eopnotsupp },       /* inactive */
-       { &vop_reclaim_desc, hfs_vop_reclaim }, /* reclaim */
+       { &vop_reclaim_desc, hfs_vop_reclaim },         /* reclaim */
        { &vop_lock_desc, genfs_lock },                 /* lock */
        { &vop_unlock_desc, genfs_unlock },             /* unlock */
-       { &vop_bmap_desc, fifo_bmap },                  /* bmap */
-       { &vop_strategy_desc, fifo_strategy },          /* strategy */
+       { &vop_bmap_desc, vn_fifo_bypass },             /* bmap */
+       { &vop_strategy_desc, vn_fifo_bypass },         /* strategy */
        { &vop_print_desc, hfs_vop_print },             /* print */
        { &vop_islocked_desc, genfs_islocked },         /* islocked */
-       { &vop_pathconf_desc, fifo_pathconf },          /* pathconf */
-       { &vop_advlock_desc, fifo_advlock },            /* advlock */
+       { &vop_pathconf_desc, vn_fifo_bypass },         /* pathconf */
+       { &vop_advlock_desc, vn_fifo_bypass },          /* advlock */
        { &vop_bwrite_desc, vn_bwrite },                /* bwrite */
-       { &vop_putpages_desc, fifo_putpages },          /* putpages */
+       { &vop_putpages_desc, vn_fifo_bypass },         /* putpages */
 #if 0
        { &vop_openextattr_desc, ffs_openextattr },     /* openextattr */
        { &vop_closeextattr_desc, ffs_closeextattr },   /* closeextattr */
diff -r 15e1cd7edcc3 -r 3ebca86a7083 sys/fs/puffs/puffs_vnops.c
--- a/sys/fs/puffs/puffs_vnops.c        Mon Mar 29 11:39:45 2010 +0000
+++ b/sys/fs/puffs/puffs_vnops.c        Mon Mar 29 13:11:32 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puffs_vnops.c,v 1.143 2010/03/27 02:37:35 pooka Exp $  */
+/*     $NetBSD: puffs_vnops.c,v 1.144 2010/03/29 13:11:33 pooka Exp $  */
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.143 2010/03/27 02:37:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.144 2010/03/29 13:11:33 pooka Exp $");
 
 #include <sys/param.h>



Home | Main Index | Thread Index | Old Index