minor cleanups

SCCS-vsn: sys/ufs/ffs/ffs_inode.c 7.14
SCCS-vsn: sys/ufs/ffs/ufs_inode.c 7.14
SCCS-vsn: sys/ufs/lfs/lfs_inode.c 7.14
SCCS-vsn: sys/ufs/ufs/ufs_inode.c 7.14

diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index dc4dbd9..d01a288 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)ffs_inode.c 7.13 (Berkeley) %G%
+ *     @(#)ffs_inode.c 7.14 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -461,7 +461,7 @@ ufs_inactive(vp)
        register struct inode *ip = VTOI(vp);
        int mode, error;
 
        register struct inode *ip = VTOI(vp);
        int mode, error;
 

-       if (ITOV(ip)->v_count != 0)
+       if (vp->v_count != 0)

                panic("ufs_inactive: not inactive");
        /*
         * Get rid of inodes related to stale file handles.
                panic("ufs_inactive: not inactive");
        /*
         * Get rid of inodes related to stale file handles.


@@ -469,7 +469,7 @@ ufs_inactive(vp)
        if (ip->i_mode == 0)
                goto freeit;
        ILOCK(ip);
        if (ip->i_mode == 0)
                goto freeit;
        ILOCK(ip);

-       if (ip->i_nlink <= 0 && (ITOV(ip)->v_mount->m_flag&M_RDONLY) == 0) {
+       if (ip->i_nlink <= 0 && (vp->v_mount->m_flag & M_RDONLY) == 0) {

                error = itrunc(ip, (u_long)0);
                mode = ip->i_mode;
                ip->i_mode = 0;
                error = itrunc(ip, (u_long)0);
                mode = ip->i_mode;
                ip->i_mode = 0;

diff --git a/usr/src/sys/ufs/ffs/ufs_inode.c b/usr/src/sys/ufs/ffs/ufs_inode.c
index 2c19ef7..9edbb66 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_inode.c
+++ b/usr/src/sys/ufs/ffs/ufs_inode.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)ufs_inode.c 7.13 (Berkeley) %G%
+ *     @(#)ufs_inode.c 7.14 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -461,7 +461,7 @@ ufs_inactive(vp)
        register struct inode *ip = VTOI(vp);
        int mode, error;
 
        register struct inode *ip = VTOI(vp);
        int mode, error;
 

-       if (ITOV(ip)->v_count != 0)
+       if (vp->v_count != 0)

                panic("ufs_inactive: not inactive");
        /*
         * Get rid of inodes related to stale file handles.
                panic("ufs_inactive: not inactive");
        /*
         * Get rid of inodes related to stale file handles.


@@ -469,7 +469,7 @@ ufs_inactive(vp)
        if (ip->i_mode == 0)
                goto freeit;
        ILOCK(ip);
        if (ip->i_mode == 0)
                goto freeit;
        ILOCK(ip);

-       if (ip->i_nlink <= 0 && (ITOV(ip)->v_mount->m_flag&M_RDONLY) == 0) {
+       if (ip->i_nlink <= 0 && (vp->v_mount->m_flag & M_RDONLY) == 0) {

                error = itrunc(ip, (u_long)0);
                mode = ip->i_mode;
                ip->i_mode = 0;
                error = itrunc(ip, (u_long)0);
                mode = ip->i_mode;
                ip->i_mode = 0;

diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index a8eb4e4..988c932 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)lfs_inode.c 7.13 (Berkeley) %G%
+ *     @(#)lfs_inode.c 7.14 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -461,7 +461,7 @@ ufs_inactive(vp)
        register struct inode *ip = VTOI(vp);
        int mode, error;
 
        register struct inode *ip = VTOI(vp);
        int mode, error;
 

-       if (ITOV(ip)->v_count != 0)
+       if (vp->v_count != 0)

                panic("ufs_inactive: not inactive");
        /*
         * Get rid of inodes related to stale file handles.
                panic("ufs_inactive: not inactive");
        /*
         * Get rid of inodes related to stale file handles.


@@ -469,7 +469,7 @@ ufs_inactive(vp)
        if (ip->i_mode == 0)
                goto freeit;
        ILOCK(ip);
        if (ip->i_mode == 0)
                goto freeit;
        ILOCK(ip);

-       if (ip->i_nlink <= 0 && (ITOV(ip)->v_mount->m_flag&M_RDONLY) == 0) {
+       if (ip->i_nlink <= 0 && (vp->v_mount->m_flag & M_RDONLY) == 0) {

                error = itrunc(ip, (u_long)0);
                mode = ip->i_mode;
                ip->i_mode = 0;
                error = itrunc(ip, (u_long)0);
                mode = ip->i_mode;
                ip->i_mode = 0;

diff --git a/usr/src/sys/ufs/ufs/ufs_inode.c b/usr/src/sys/ufs/ufs/ufs_inode.c
index 2c19ef7..9edbb66 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_inode.c
+++ b/usr/src/sys/ufs/ufs/ufs_inode.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)ufs_inode.c 7.13 (Berkeley) %G%
+ *     @(#)ufs_inode.c 7.14 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -461,7 +461,7 @@ ufs_inactive(vp)
        register struct inode *ip = VTOI(vp);
        int mode, error;
 
        register struct inode *ip = VTOI(vp);
        int mode, error;
 

-       if (ITOV(ip)->v_count != 0)
+       if (vp->v_count != 0)

                panic("ufs_inactive: not inactive");
        /*
         * Get rid of inodes related to stale file handles.
                panic("ufs_inactive: not inactive");
        /*
         * Get rid of inodes related to stale file handles.


@@ -469,7 +469,7 @@ ufs_inactive(vp)
        if (ip->i_mode == 0)
                goto freeit;
        ILOCK(ip);
        if (ip->i_mode == 0)
                goto freeit;
        ILOCK(ip);

-       if (ip->i_nlink <= 0 && (ITOV(ip)->v_mount->m_flag&M_RDONLY) == 0) {
+       if (ip->i_nlink <= 0 && (vp->v_mount->m_flag & M_RDONLY) == 0) {

                error = itrunc(ip, (u_long)0);
                mode = ip->i_mode;
                ip->i_mode = 0;
                error = itrunc(ip, (u_long)0);
                mode = ip->i_mode;
                ip->i_mode = 0;