flock-sysid-20030303

FIXES 1325

featurize flock sysid

diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c
index b586a912b186e8b4c181e900520c11be9755e43d..89f97b4153f4ff19ec007b71f298a6642022bee1 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_flock.c
+++ b/src/afs/VNOPS/afs_vnop_flock.c
@@ -183,7 +183,7 @@ static int lockIdcmp2(struct AFS_FLOCK *flock1, struct vcache *vp,
     }
 
     for (slp = vp->slocks; slp; slp = slp->next) {
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
        if (flock1->l_sysid != slp->sysid) {
          continue;
        }
@@ -611,7 +611,7 @@ static int HandleGetLock(register struct vcache *avc,
            af->l_type = F_WRLCK;
 
        af->l_pid = 0;
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
        af->l_sysid = 0;
 #endif
        goto done;
@@ -633,12 +633,12 @@ static int HandleGetLock(register struct vcache *avc,
        af->l_type = F_WRLCK;           /* not us, so lock would block */
        if (avc->slocks) {              /* we know who, so tell */
            af->l_pid = avc->slocks->pid;
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
            af->l_sysid = avc->slocks->sysid;
 #endif
        } else {
            af->l_pid = 0;      /* XXX can't happen?? */
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
            af->l_sysid = 0;
 #endif
        }
@@ -654,12 +654,12 @@ static int HandleGetLock(register struct vcache *avc,
            af->l_type = F_WRLCK;
            if (avc->slocks) {
                af->l_pid = avc->slocks->pid;
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
                af->l_sysid = avc->slocks->sysid;
 #endif
            } else {
                af->l_pid = 0;  /* XXX can't happen?? */
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
                af->l_sysid = 0;
 #endif
            }
@@ -680,14 +680,14 @@ static int HandleGetLock(register struct vcache *avc,
        
        af->l_type = F_RDLCK;
        af->l_pid = 0;
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
        af->l_sysid = 0;
 #endif
        /* find a pid that isn't our own */
        for (slp = avc->slocks; slp; slp = slp->next) {
            if (lockIdcmp2(&flock, NULL, slp, 1, clid)) {
                af->l_pid = slp->pid;
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
                af->l_sysid = avc->slocks->sysid;
 #endif
                break;
@@ -705,12 +705,12 @@ static int HandleGetLock(register struct vcache *avc,
                af->l_type = F_WRLCK;
                if (avc->slocks) {
                    af->l_pid = avc->slocks->pid;
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
                    af->l_sysid = avc->slocks->sysid;
 #endif
                } else {
                    af->l_pid = 0;  /* XXX can't happen?? */
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
                    af->l_sysid = 0;
 #endif
                }
@@ -730,14 +730,14 @@ static int HandleGetLock(register struct vcache *avc,
            struct SimpleLocks *slp;
            af->l_type = F_RDLCK;
            af->l_pid = 0;
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
            af->l_sysid = 0;
 #endif
            /* find a pid that isn't our own */
            for (slp = avc->slocks; slp; slp = slp->next) {
                if (lockIdcmp2(&flock, NULL, slp, 1, clid)) {
                    af->l_pid = slp->pid;
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
                    af->l_sysid = avc->slocks->sysid;
 #endif
                    break;
@@ -761,7 +761,7 @@ static int HandleGetLock(register struct vcache *avc,
        else
            af->l_type = F_WRLCK;
        af->l_pid = 0;
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
+#if defined(AFS_HAVE_FLOCK_SYSID)
        af->l_sysid = 0;
 #endif
 

diff --git a/src/config/param.rs_aix42.h b/src/config/param.rs_aix42.h
index 2780b2af986167debe21f95592f2b29888f7f4ac..8e8401a9cb99fd1e09535e23e9f2b18ffe67bc5a 100644 (file)
--- a/src/config/param.rs_aix42.h
+++ b/src/config/param.rs_aix42.h
@@ -25,6 +25,8 @@
 #define AFS_64BIT_IOPS_ENV      1       /* needed for NAMEI... */
 #endif
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #include <afs/afs_sysnames.h>
 
 /* Global lock in AFS part of client. */
@@ -118,6 +120,8 @@
 #define        AFS_AIX41_ENV           1
 #define AFS_AIX42_ENV          1
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #endif /* KERNEL */
 
 #include <afs/afs_sysnames.h>

diff --git a/src/config/param.rs_aix51.h b/src/config/param.rs_aix51.h
index 8c907683dcb66346e9b5165b872f605248c75471..e4eef34ba4f75dbce5e62a4a4a19fd793558939d 100644 (file)
--- a/src/config/param.rs_aix51.h
+++ b/src/config/param.rs_aix51.h
@@ -28,6 +28,8 @@
 #define BITMAP_LATER           1
 #define FAST_RESTART           1
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #include <afs/afs_sysnames.h>
 
 /* Global lock in AFS part of client. */
@@ -129,6 +131,8 @@
 #define AFS_AIX42_ENV          1
 #define AFS_AIX51_ENV          1
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #endif /* KERNEL */
 
 #include <afs/afs_sysnames.h>

diff --git a/src/config/param.sgi_62.h b/src/config/param.sgi_62.h
index da0a3f63eb9e6d4e60f9e96652a33875a59460ee..02ebcce393e3dbcc1b0684336d5711c0f20017fb 100644 (file)
--- a/src/config/param.sgi_62.h
+++ b/src/config/param.sgi_62.h
@@ -27,6 +27,8 @@
 #define AFS_SGI_EXMAG          1       /* use magic fields in extents for AFS extra fields */
 /* AFS_SGI_SHORTSTACK not required since we have a 16K stack. */       
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #define AFS_PAG_LAST_ENV       1       /* PAG comes last in groups. */
 #define _ANSI_C_SOURCE         1       /* rx_user.h */
 

diff --git a/src/config/param.sgi_63.h b/src/config/param.sgi_63.h
index 003f84fe550523203ff777ac6c643e410973b6af..fa97ad919ac129e4e9b52a60af269c9a8229449c 100644 (file)
--- a/src/config/param.sgi_63.h
+++ b/src/config/param.sgi_63.h
@@ -28,6 +28,8 @@
 #define AFS_SGI_EXMAG          1       /* use magic fields in extents for AFS extra fields */
 /* AFS_SGI_SHORTSTACK not required since we have a 16K stack. */       
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #define _ANSI_C_SOURCE         1       /* rx_user.h */
 
 #define AFS_64BIT_ENV          1       /* Defines afs_int32 as int, not long. */

diff --git a/src/config/param.sgi_64.h b/src/config/param.sgi_64.h
index 589e268258b2c1af931a87d7a424d6bb3e3c7745..dfcec84f8463a5cb4c3ed0e004d005d4fde3e8a9 100644 (file)
--- a/src/config/param.sgi_64.h
+++ b/src/config/param.sgi_64.h
@@ -29,6 +29,8 @@
 #define AFS_SGI_EXMAG          1       /* use magic fields in extents for AFS extra fields */
 /* AFS_SGI_SHORTSTACK not required since we have a 16K stack. */       
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #define _ANSI_C_SOURCE         1       /* rx_user.h */
 
 #define AFS_64BIT_ENV          1       /* Defines afs_int32 as int, not long. */

diff --git a/src/config/param.sgi_65.h b/src/config/param.sgi_65.h
index 9a82b8daf43087b92a7b94981b201c84b516d0ea..90b0752c52f91db6b61b8c650a1cc6f3456bf7c2 100644 (file)
--- a/src/config/param.sgi_65.h
+++ b/src/config/param.sgi_65.h
@@ -30,6 +30,8 @@
 #define AFS_SGI_EXMAG          1       /* use magic fields in extents for AFS extra fields */
 /* AFS_SGI_SHORTSTACK not required since we have a 16K stack. */       
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #define RXK_LISTENER_ENV       1       /* Use an rx listener daemon */
 #define AFS_GCPAGS             0       /* if nonzero, garbage collect PAGs */
 

diff --git a/src/config/param.sun4x_55.h b/src/config/param.sun4x_55.h
index 1911cbe88bece18b9b7a51f2b0357d0eed14d4e4..1a7408cae44d07dd4fe150f77feef9efa5288aca 100644 (file)
--- a/src/config/param.sun4x_55.h
+++ b/src/config/param.sun4x_55.h
@@ -26,6 +26,8 @@
 #define        AFS_SUN54_ENV           1
 #define        AFS_SUN55_ENV           1
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #include <afs/afs_sysnames.h>
 
 #define RXK_LISTENER_ENV       1

diff --git a/src/config/param.sun4x_56.h b/src/config/param.sun4x_56.h
index 396ffb3218135bfe4c1b8eb08c927db47294dec2..16e3c1f8517d835f7c1231f5fcc85f3a21ce4ab0 100644 (file)
--- a/src/config/param.sun4x_56.h
+++ b/src/config/param.sun4x_56.h
@@ -35,6 +35,8 @@
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 #define        AFS_SYSCALL             105
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 /* File system entry (used if mount.h doesn't define MOUNT_AFS */
 #define AFS_MOUNT_AFS   "afs"
 

diff --git a/src/config/param.sun4x_57.h b/src/config/param.sun4x_57.h
index 0d6e348867d94e4a0d8e46af488c74d18145aff8..6a2af502581ee7c32cbadf2f460b0cb7fd2af9de 100644 (file)
--- a/src/config/param.sun4x_57.h
+++ b/src/config/param.sun4x_57.h
@@ -30,6 +30,8 @@
 
 #define AFS_64BIT_ENV          1       /* Defines afs_int32 as int, not long. */
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #include <afs/afs_sysnames.h>
 
 #define AFS_GLOBAL_SUNLOCK     1       /* For global locking */

diff --git a/src/config/param.sun4x_58.h b/src/config/param.sun4x_58.h
index badc6454dae8ed66f5de5c73f376aa7302dfce86..573608a11213846b8c2a6ea092562d06ad1f7236 100644 (file)
--- a/src/config/param.sun4x_58.h
+++ b/src/config/param.sun4x_58.h
@@ -22,6 +22,8 @@
 
 #define AFS_64BIT_ENV          1       /* Defines afs_int32 as int, not long. */
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #ifdef AFS_NAMEI_ENV
 #define AFS_64BIT_IOPS_ENV     1       /* needed for NAMEI... */
 #else /* AFS_NAMEI_ENV */

diff --git a/src/config/param.sun4x_59.h b/src/config/param.sun4x_59.h
index edb847a0056d176a108328f4afa917302d825b54..5be31784718d53a21f97a5100300ce07fe665cb8 100644 (file)
--- a/src/config/param.sun4x_59.h
+++ b/src/config/param.sun4x_59.h
@@ -23,6 +23,8 @@
 
 #define AFS_64BIT_ENV          1       /* Defines afs_int32 as int, not long. */
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #ifdef AFS_NAMEI_ENV
 #define AFS_64BIT_IOPS_ENV     1       /* needed for NAMEI... */
 #else /* AFS_NAMEI_ENV */

diff --git a/src/config/param.sunx86_54.h b/src/config/param.sunx86_54.h
index 29ffa171ef53089dbcdadc267b972103cdf8b59f..5cd670f20c1bc3d6dae85365921b0df0a14c0889 100644 (file)
--- a/src/config/param.sunx86_54.h
+++ b/src/config/param.sunx86_54.h
@@ -28,6 +28,8 @@
 #define        AFS_SUN54_ENV           1
 #define        AFS_X86_ENV             1
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #include <afs/afs_sysnames.h>
 
 #define AFS_GLOBAL_SUNLOCK     1       /* For global locking */

diff --git a/src/config/param.sunx86_57.h b/src/config/param.sunx86_57.h
index 5fb943a795cbb305f39f671fca158348098a17c8..d4dd16e8a47c42e9d7c364615dc4126d41fa3d31 100644 (file)
--- a/src/config/param.sunx86_57.h
+++ b/src/config/param.sunx86_57.h
@@ -31,6 +31,9 @@
 
 #define AFS_64BIT_ENV          1       /* Defines afs_int32 as int, not long. */
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
+
 #include <afs/afs_sysnames.h>
 
 #define AFS_GLOBAL_SUNLOCK     1       /* For global locking */

diff --git a/src/config/param.sunx86_58.h b/src/config/param.sunx86_58.h
index 31ec5744ce3e5b1dde718f9399763e8291a2fc7d..ad0ccd40c7e1e3785ecb89dd3a35a26a0d05a223 100644 (file)
--- a/src/config/param.sunx86_58.h
+++ b/src/config/param.sunx86_58.h
@@ -32,6 +32,8 @@
 
 #define AFS_64BIT_ENV          1       /* Defines afs_int32 as int, not long. */
 
+#define AFS_HAVE_FLOCK_SYSID    1
+
 #include <afs/afs_sysnames.h>
 
 #define AFS_GLOBAL_SUNLOCK     1       /* For global locking */