refresh

diff --git a/meta b/meta
index 4a3968eebdd029ef9709758f4517294198eee060..1300446d702c8241c1b3774ee3450f7c7b211727 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: f3ecc51a285f285c2fe4d555df2267e58e790f28
-Head: 691f52616b409f595530f781a842bff22f1eda84
+Previous: 7296f04125da49022e2e2fa585ad6c5f029674e7
+Head: fdb0bf40c51be7713f7cf670de0974071bdcbabb
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -8,8 +8,7 @@ Applied:
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
-  locking: 558e5577364aec3531c54b28def6e16f0c926524
-  refresh-temp: 691f52616b409f595530f781a842bff22f1eda84
+  locking: fdb0bf40c51be7713f7cf670de0974071bdcbabb
 Unapplied:
   verbose: 572c8094123639a268eb1cbb92f7947ffbdd406b
   dbg_1: 3258ebd9b3f17653231089184f29ee2352be9d46

diff --git a/patches/locking b/patches/locking
index 2b4bdc4331971b6f2e3578adf5af42491e7cd221..ca943a02e4ab314099b6c17be8e951321d98fe2a 100644 (file)
--- a/patches/locking
+++ b/patches/locking
@@ -1,5 +1,5 @@
 Bottom: 1ac64e1267b46288459f8b4a25aeb893b3d48cba
-Top:    2895e38b888c2de8c2681ec086046cb241282cc2
+Top:    b4a0745eb9fbe073654d6057445a51e490d3711d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-02 14:12:56 -0800
 
@@ -31,7 +31,7 @@ index 372cd7b..7147fe2 100644
  # Default resolution protocol to resolve IP addresses into IB GIDs.\r
  # Supported protocols are:\r
 diff --git a/src/acm.c b/src/acm.c
-index 3152392..a680b0b 100644
+index 3152392..bda18b5 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -36,8 +36,10 @@
@@ -70,7 +70,7 @@ index 3152392..a680b0b 100644
        acm_log(0, "address resolution %d\n", addr_prot);
        acm_log(0, "route resolution %d\n", route_prot);
        acm_log(0, "loopback resolution %d\n", loopback_prot);
-@@ -2716,6 +2722,20 @@ static FILE *acm_open_log(void)
+@@ -2716,6 +2722,25 @@ static FILE *acm_open_log(void)
        return f;
  }
  
@@ -83,6 +83,11 @@ index 3152392..a680b0b 100644
 +      if (lock_fd < 0)
 +              return lock_fd;
 +
++      if (lockf(lock_fd, F_TLOCK, 0)) {
++              close(lock_fd);
++              return -1;
++      }
++
 +      sprintf(pid, "%d\n", getpid());
 +      write(lock_fd, pid, strlen(pid));
 +      return 0;
@@ -91,7 +96,7 @@ index 3152392..a680b0b 100644
  static void daemonize(void)
  {
        pid_t pid, sid;
-@@ -2778,6 +2798,8 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2778,6 +2803,8 @@ int CDECL_FUNC main(int argc, char **argv)
                return -1;
  
        acm_set_options();

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9961925..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 2895e38b888c2de8c2681ec086046cb241282cc2
-Top:    b4a0745eb9fbe073654d6057445a51e490d3711d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-08 11:48:06 -0800
-
-Refresh of locking
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index a680b0b..bda18b5 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2731,6 +2731,11 @@ static int acm_open_lock_file(void)
-       if (lock_fd < 0)
-               return lock_fd;
- 
-+      if (lockf(lock_fd, F_TLOCK, 0)) {
-+              close(lock_fd);
-+              return -1;
-+      }
-+
-       sprintf(pid, "%d\n", getpid());
-       write(lock_fd, pid, strlen(pid));
-       return 0;