refresh

diff --git a/meta b/meta
index 8e19cf533528dc08bf23142341bc71bb51bb3829..2e993cfbc2f2c20bace046c4a4498a937a6514ab 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 38c48d89060e0efeb15dd7603d50606254b5d13e
-Head: 312a567eec33f703f418c7610b4f227d012f83bb
+Previous: af0df451d08304f2e386dc23f999d2883d97588f
+Head: a3e39b20a6a68bf9cc991eba690bf5d952c566ca
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -8,8 +8,7 @@ Applied:
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
-  locking: 2945ee3502392e543e39ddfb642057bc80cad9ef
-  refresh-temp: 312a567eec33f703f418c7610b4f227d012f83bb
+  locking: a3e39b20a6a68bf9cc991eba690bf5d952c566ca
 Unapplied:
   verbose: f342bb15537fbdb06e286ac9f17d20551e63c295
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6

diff --git a/patches/locking b/patches/locking
index 3fab6415107f046c220383473a72935ad6afca41..de6496fbab8f24f34da0eac3645d57dbef6f80fb 100644 (file)
--- a/patches/locking
+++ b/patches/locking
@@ -1,5 +1,5 @@
 Bottom: 1ac64e1267b46288459f8b4a25aeb893b3d48cba
-Top:    caa30f6e0c510b4add867f1d87a2133c5a4d0bc1
+Top:    32588281780667752a506dba6c2782233250df24
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-02 14:12:56 -0800
 
@@ -31,10 +31,18 @@ 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..3a5404a 100644
+index 3152392..c503013 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -208,6 +208,7 @@ static char *opts_file = "/etc/ibacm/acm_opts.cfg";
+@@ -38,6 +38,7 @@
+ #include <arpa/inet.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
++#include <fcntl.h>
+ #include <infiniband/acm.h>
+ #include <infiniband/umad.h>
+ #include <infiniband/verbs.h>
+@@ -208,6 +209,7 @@ static char *opts_file = "/etc/ibacm/acm_opts.cfg";
  static char *addr_file = "/etc/ibacm/acm_addr.cfg";
  static char log_file[128] = "stdout";
  static int log_level = 0;
@@ -42,7 +50,7 @@ index 3152392..3a5404a 100644
  static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
  static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
  static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
-@@ -2654,6 +2655,8 @@ static void acm_set_options(void)
+@@ -2654,6 +2656,8 @@ static void acm_set_options(void)
                        strcpy(log_file, value);
                else if (!stricmp("log_level", opt))
                        log_level = atoi(value);
@@ -51,7 +59,7 @@ index 3152392..3a5404a 100644
                else if (!stricmp("addr_prot", opt))
                        addr_prot = acm_convert_addr_prot(value);
                else if (!stricmp("route_prot", opt))
-@@ -2686,6 +2689,7 @@ static void acm_set_options(void)
+@@ -2686,6 +2690,7 @@ static void acm_set_options(void)
  static void acm_log_options(void)
  {
        acm_log(0, "log level %d\n", log_level);
@@ -59,7 +67,7 @@ index 3152392..3a5404a 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 +2720,20 @@ static FILE *acm_open_log(void)
+@@ -2716,6 +2721,20 @@ static FILE *acm_open_log(void)
        return f;
  }
  
@@ -80,7 +88,7 @@ index 3152392..3a5404a 100644
  static void daemonize(void)
  {
        pid_t pid, sid;
-@@ -2778,6 +2796,8 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2778,6 +2797,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 c10926c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: caa30f6e0c510b4add867f1d87a2133c5a4d0bc1
-Top:    32588281780667752a506dba6c2782233250df24
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-03 13:50:18 -0800
-
-Refresh of locking
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 3a5404a..c503013 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -38,6 +38,7 @@
- #include <arpa/inet.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-+#include <fcntl.h>
- #include <infiniband/acm.h>
- #include <infiniband/umad.h>
- #include <infiniband/verbs.h>