ILOCK and IUNLOCK are gone, now always use VOP_LOCK and VOP_UNLOCK

[unix-history] / usr / src / sys / ufs / ffs / inode.h

diff --git a/usr/src/sys/ufs/ffs/inode.h b/usr/src/sys/ufs/ffs/inode.h
index b3ccc57..3b2f474 100644 (file)
--- a/usr/src/sys/ufs/ffs/inode.h
+++ b/usr/src/sys/ufs/ffs/inode.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)inode.h     7.31 (Berkeley) %G%
+ *     @(#)inode.h     7.32 (Berkeley) %G%

  */
 
 #include <ufs/ufs/dinode.h>
  */
 
 #include <ufs/ufs/dinode.h>


@@ -107,28 +107,6 @@ struct indir {
 #define VTOI(vp)       ((struct inode *)(vp)->v_data)
 #define ITOV(ip)       ((ip)->i_vnode)
 
 #define VTOI(vp)       ((struct inode *)(vp)->v_data)
 #define ITOV(ip)       ((ip)->i_vnode)
 

-/* Lock and unlock inodes. */
-#ifdef notdef
-#define        ILOCK(ip) { \
-       while ((ip)->i_flag & ILOCKED) { \
-               (ip)->i_flag |= IWANT; \
-               (void) sleep((caddr_t)(ip), PINOD); \
-       } \
-       (ip)->i_flag |= ILOCKED; \
-}
-
-#define        IUNLOCK(ip) { \
-       (ip)->i_flag &= ~ILOCKED; \
-       if ((ip)->i_flag&IWANT) { \
-               (ip)->i_flag &= ~IWANT; \
-               wakeup((caddr_t)(ip)); \
-       } \
-}
-#else
-#define ILOCK(ip)      ufs_ilock(ip)
-#define IUNLOCK(ip)    ufs_iunlock(ip)
-#endif
-

 #define        ITIMES(ip, t1, t2) { \
        if ((ip)->i_flag&(IUPD|IACC|ICHG)) { \
                (ip)->i_flag |= IMOD; \
 #define        ITIMES(ip, t1, t2) { \
        if ((ip)->i_flag&(IUPD|IACC|ICHG)) { \
                (ip)->i_flag |= IMOD; \