ensure that correct value is passed

SCCS-vsn: sys/ufs/ffs/ufs_vfsops.c 7.63
SCCS-vsn: sys/ufs/ufs/ufs_vfsops.c 7.63
SCCS-vsn: sys/ufs/ffs/ffs_vfsops.c 7.77
SCCS-vsn: sys/ufs/lfs/lfs_vfsops.c 7.85

diff --git a/usr/src/sys/ufs/ffs/ffs_vfsops.c b/usr/src/sys/ufs/ffs/ffs_vfsops.c
index 815bcca..4861684 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vfsops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vfsops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_vfsops.c        7.76 (Berkeley) %G%
+ *     @(#)ffs_vfsops.c        7.77 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -631,7 +631,7 @@ ffs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
        if (ufhp->ufid_ino < ROOTINO ||
            ufhp->ufid_ino >= fs->fs_ncg * fs->fs_ipg)
                return (ESTALE);
        if (ufhp->ufid_ino < ROOTINO ||
            ufhp->ufid_ino >= fs->fs_ncg * fs->fs_ipg)
                return (ESTALE);

-       return (ufs_check_export(mp, fhp, nam, vpp, exflagsp, credanonp));
+       return (ufs_check_export(mp, ufhp, nam, vpp, exflagsp, credanonp));

 }
 
 /*
 }
 
 /*

diff --git a/usr/src/sys/ufs/ffs/ufs_vfsops.c b/usr/src/sys/ufs/ffs/ufs_vfsops.c
index 4e0b70c..eb3d796 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vfsops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vfsops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vfsops.c        7.62 (Berkeley) %G%
+ *     @(#)ufs_vfsops.c        7.63 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -269,15 +269,14 @@ ufs_free_addrlist(ump)
  * return a vnode for the presented file handle.
  */
 int
  * return a vnode for the presented file handle.
  */
 int

-ufs_check_export(mp, fhp, nam, vpp, exflagsp, credanonp)
+ufs_check_export(mp, ufhp, nam, vpp, exflagsp, credanonp)

        register struct mount *mp;
        register struct mount *mp;

-       struct fid *fhp;
+       struct ufid *ufhp;

        struct mbuf *nam;
        struct vnode **vpp;
        int *exflagsp;
        struct ucred **credanonp;
 {
        struct mbuf *nam;
        struct vnode **vpp;
        int *exflagsp;
        struct ucred **credanonp;
 {

-       register struct ufid *ufhp;

        register struct inode *ip;
        register struct netcred *np;
        register struct ufsmount *ump = VFSTOUFS(mp);
        register struct inode *ip;
        register struct netcred *np;
        register struct ufsmount *ump = VFSTOUFS(mp);

diff --git a/usr/src/sys/ufs/lfs/lfs_vfsops.c b/usr/src/sys/ufs/lfs/lfs_vfsops.c
index 68916b8..a05678c 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vfsops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vfsops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_vfsops.c        7.84 (Berkeley) %G%
+ *     @(#)lfs_vfsops.c        7.85 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -510,7 +510,7 @@ lfs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
        ufhp = (struct ufid *)fhp;
        if (ufhp->ufid_ino < ROOTINO)
                return (ESTALE);
        ufhp = (struct ufid *)fhp;
        if (ufhp->ufid_ino < ROOTINO)
                return (ESTALE);

-       return (ufs_check_export(mp, fhp, nam, vpp, exflagsp, credanonp));
+       return (ufs_check_export(mp, ufhp, nam, vpp, exflagsp, credanonp));

 }
 
 /*
 }
 
 /*

diff --git a/usr/src/sys/ufs/ufs/ufs_vfsops.c b/usr/src/sys/ufs/ufs/ufs_vfsops.c
index 4e0b70c..eb3d796 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vfsops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vfsops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vfsops.c        7.62 (Berkeley) %G%
+ *     @(#)ufs_vfsops.c        7.63 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -269,15 +269,14 @@ ufs_free_addrlist(ump)
  * return a vnode for the presented file handle.
  */
 int
  * return a vnode for the presented file handle.
  */
 int

-ufs_check_export(mp, fhp, nam, vpp, exflagsp, credanonp)
+ufs_check_export(mp, ufhp, nam, vpp, exflagsp, credanonp)

        register struct mount *mp;
        register struct mount *mp;

-       struct fid *fhp;
+       struct ufid *ufhp;

        struct mbuf *nam;
        struct vnode **vpp;
        int *exflagsp;
        struct ucred **credanonp;
 {
        struct mbuf *nam;
        struct vnode **vpp;
        int *exflagsp;
        struct ucred **credanonp;
 {

-       register struct ufid *ufhp;

        register struct inode *ip;
        register struct netcred *np;
        register struct ufsmount *ump = VFSTOUFS(mp);
        register struct inode *ip;
        register struct netcred *np;
        register struct ufsmount *ump = VFSTOUFS(mp);