refresh

diff --git a/meta b/meta
index 8850cb2b9ffa71a745366e40f22a015d144d19f2..cff2b2838778f718f0b7ccbab8755b73116d4520 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 97e9d18e97207324b9575bd39f61fa01a433a544
-Head: e63e19001e9681a7dffabb7109113690fca7c989
+Previous: c1dcbb1c874764e3698cc42eadce63a83fc0763b
+Head: 2ffda7f2991395570b9e776ff5ae256ca9684771
 Applied:
   rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4
-  cma-rm-pd: 6972e479f8b886ca4577de6c4ca30e1f9cbc660d
-  refresh-temp: e63e19001e9681a7dffabb7109113690fca7c989
+  cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
 Unapplied:
   transpose: c6f28dc048728ed30f1b57b6dcfd114ab62e5dde
   fork: 7e54bf6ca1d3f328bfcf9b4c0153c8f3f9fa3afa

diff --git a/patches/cma-rm-pd b/patches/cma-rm-pd
index 1ee0ddee4e928b2412260ef6ed5af6e1c3f62065..75493637cef27f66af23d31d42948a942bd91952 100644 (file)
--- a/patches/cma-rm-pd
+++ b/patches/cma-rm-pd
@@ -1,5 +1,5 @@
 Bottom: 7683fa697371afc1116e378e4f1b6c848ead85aa
-Top:    95b121ec32dc0d0d10c0de528bba1ae1ed0075b1
+Top:    c8846aeda5a7df646fc7288b1944956da799963f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-19 10:09:48 -0700
 
@@ -19,7 +19,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/cma.c b/src/cma.c
-index bad8bce..65b52bf 100755
+index bad8bce..5280620 100755
 --- a/src/cma.c
 +++ b/src/cma.c
 @@ -76,6 +76,7 @@ struct cma_device {
@@ -30,15 +30,7 @@ index bad8bce..65b52bf 100755
        int                 max_qpsize;
        uint8_t             max_initiator_depth;
        uint8_t             max_responder_resources;
-@@ -122,6 +123,7 @@ static int cma_dev_cnt;
- static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
- static int abi_ver = RDMA_USER_CM_MAX_ABI_VERSION;
- int af_ib_support;
-+static int verbs_refcnt;
- 
- #define container_of(ptr, type, field) \
-       ((type *) ((void *)ptr - offsetof(type, field)))
-@@ -132,7 +134,8 @@ static void ucma_cleanup(void)
+@@ -132,7 +133,8 @@ static void ucma_cleanup(void)
  
        if (cma_dev_cnt) {
                while (cma_dev_cnt--) {
@@ -48,7 +40,7 @@ index bad8bce..65b52bf 100755
                        ibv_close_device(cma_dev_array[cma_dev_cnt].verbs);
                }
  
-@@ -235,7 +238,7 @@ int ucma_init(void)
+@@ -235,7 +237,7 @@ int ucma_init(void)
                goto err2;
        }
                
@@ -57,7 +49,7 @@ index bad8bce..65b52bf 100755
        if (!cma_dev_array) {
                ret = ERR(ENOMEM);
                goto err2;
-@@ -252,13 +255,6 @@ int ucma_init(void)
+@@ -252,13 +254,6 @@ int ucma_init(void)
                        goto err3;
                }
  
@@ -71,7 +63,7 @@ index bad8bce..65b52bf 100755
                i++;
                ret = ibv_query_device(cma_dev->verbs, &attr);
                if (ret) {
-@@ -280,10 +276,8 @@ int ucma_init(void)
+@@ -280,10 +275,8 @@ int ucma_init(void)
        return 0;
  
  err3:
@@ -83,7 +75,7 @@ index bad8bce..65b52bf 100755
        free(cma_dev_array);
  err2:
        ibv_free_device_list(dev_list);
-@@ -354,23 +348,45 @@ void rdma_destroy_event_channel(struct rdma_event_channel *channel)
+@@ -354,23 +347,45 @@ void rdma_destroy_event_channel(struct rdma_event_channel *channel)
  static int ucma_get_device(struct cma_id_private *id_priv, uint64_t guid)
  {
        struct cma_device *cma_dev;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9b442a4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 95b121ec32dc0d0d10c0de528bba1ae1ed0075b1
-Top:    c8846aeda5a7df646fc7288b1944956da799963f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-19 14:22:04 -0700
-
-Refresh of cma-rm-pd
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index 65b52bf..5280620 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -123,7 +123,6 @@ static int cma_dev_cnt;
- static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
- static int abi_ver = RDMA_USER_CM_MAX_ABI_VERSION;
- int af_ib_support;
--static int verbs_refcnt;
- 
- #define container_of(ptr, type, field) \
-       ((type *) ((void *)ptr - offsetof(type, field)))