refresh

diff --git a/meta b/meta
index 1a8d7f9a1ab3cc0857c50afd66f85dc9761c2683..59903070c99b0595720330871d49dad70d97e808 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 09cbff5f823652c918412f17263f3f4eb121d139
-Head: 1f649bad3eac3283fdeb52735e9867c44ec80f9f
+Previous: 7424c2854c1ee97992ede95dd435b18b0c9b83ca
+Head: 2b2aad809afc56fa3157f5cf99036f92b9c90f16
 Applied:
-  prints: 2f91b63887a3d3d6344c787edfac10839420549a
-  refresh-temp: 1f649bad3eac3283fdeb52735e9867c44ec80f9f
+  prints: 2b2aad809afc56fa3157f5cf99036f92b9c90f16
 Unapplied:
   raccept-invalid: 8d5251952074622e8be0c9828d5eb573b4a1c6d2
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba

diff --git a/patches/prints b/patches/prints
index 51adbb442a6fb8172174b34d3d92197e17bb0912..f74d437bf47ef9b1c3101742d66e95b47c35ea89 100644 (file)
--- a/patches/prints
+++ b/patches/prints
@@ -1,5 +1,5 @@
 Bottom: c14a3ce4505928dd5312f5191586474d43205742
-Top:    c14a3ce4505928dd5312f5191586474d43205742
+Top:    3556f173e3d38cdf07e4b42632dc27ffd1a6ab1f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2015-04-28 14:31:15 -0700
 
@@ -15,4 +15,73 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/cma.c b/src/cma.c
+index bdbd7e8..3e6262c 100644
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -173,17 +173,12 @@ static int check_abi_version(void)
+                * backports, assume the most recent version of the ABI.  If
+                * we're wrong, we'll simply fail later when calling the ABI.
+                */
+-              fprintf(stderr, PFX "Warning: couldn't read ABI version.\n");
+-              fprintf(stderr, PFX "Warning: assuming: %d\n", abi_ver);
+               return 0;
+       }
+ 
+       abi_ver = strtol(value, NULL, 10);
+       if (abi_ver < RDMA_USER_CM_MIN_ABI_VERSION ||
+           abi_ver > RDMA_USER_CM_MAX_ABI_VERSION) {
+-              fprintf(stderr, PFX "Fatal: kernel ABI version %d "
+-                              "doesn't match library version %d.\n",
+-                              abi_ver, RDMA_USER_CM_MAX_ABI_VERSION);
+               return -1;
+       }
+       return 0;
+@@ -237,13 +232,11 @@ int ucma_init(void)
+ 
+       dev_list = ibv_get_device_list(&dev_cnt);
+       if (!dev_list) {
+-              fprintf(stderr, PFX "Fatal: unable to get RDMA device list\n");
+               ret = ERR(ENODEV);
+               goto err1;
+       }
+ 
+       if (!dev_cnt) {
+-              fprintf(stderr, PFX "Fatal: no RDMA devices found\n");
+               ret = ERR(ENODEV);
+               goto err2;
+       }
+@@ -279,7 +272,6 @@ static struct ibv_context *ucma_open_device(uint64_t guid)
+ 
+       dev_list = ibv_get_device_list(NULL);
+       if (!dev_list) {
+-              fprintf(stderr, PFX "Fatal: unable to get RDMA device list\n");
+               return NULL;
+       }
+ 
+@@ -290,9 +282,6 @@ static struct ibv_context *ucma_open_device(uint64_t guid)
+               }
+       }
+ 
+-      if (!verbs)
+-              fprintf(stderr, PFX "Fatal: unable to open RDMA device\n");
+-
+       ibv_free_device_list(dev_list);
+       return verbs;
+ }
+@@ -312,7 +301,6 @@ static int ucma_init_device(struct cma_device *cma_dev)
+ 
+       ret = ibv_query_device(cma_dev->verbs, &attr);
+       if (ret) {
+-              fprintf(stderr, PFX "Fatal: unable to query RDMA device\n");
+               ret = ERR(ret);
+               goto err;
+       }
+@@ -410,7 +398,6 @@ struct rdma_event_channel *rdma_create_event_channel(void)
+ 
+       channel->fd = open("/dev/infiniband/rdma_cm", O_RDWR | O_CLOEXEC);
+       if (channel->fd < 0) {
+-              fprintf(stderr, PFX "Fatal: unable to open /dev/infiniband/rdma_cm\n");
+               goto err;
+       }
+       return channel;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4c424e7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,79 +0,0 @@
-Bottom: c14a3ce4505928dd5312f5191586474d43205742
-Top:    3556f173e3d38cdf07e4b42632dc27ffd1a6ab1f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2015-04-28 14:32:25 -0700
-
-Refresh of prints
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index bdbd7e8..3e6262c 100644
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -173,17 +173,12 @@ static int check_abi_version(void)
-                * backports, assume the most recent version of the ABI.  If
-                * we're wrong, we'll simply fail later when calling the ABI.
-                */
--              fprintf(stderr, PFX "Warning: couldn't read ABI version.\n");
--              fprintf(stderr, PFX "Warning: assuming: %d\n", abi_ver);
-               return 0;
-       }
- 
-       abi_ver = strtol(value, NULL, 10);
-       if (abi_ver < RDMA_USER_CM_MIN_ABI_VERSION ||
-           abi_ver > RDMA_USER_CM_MAX_ABI_VERSION) {
--              fprintf(stderr, PFX "Fatal: kernel ABI version %d "
--                              "doesn't match library version %d.\n",
--                              abi_ver, RDMA_USER_CM_MAX_ABI_VERSION);
-               return -1;
-       }
-       return 0;
-@@ -237,13 +232,11 @@ int ucma_init(void)
- 
-       dev_list = ibv_get_device_list(&dev_cnt);
-       if (!dev_list) {
--              fprintf(stderr, PFX "Fatal: unable to get RDMA device list\n");
-               ret = ERR(ENODEV);
-               goto err1;
-       }
- 
-       if (!dev_cnt) {
--              fprintf(stderr, PFX "Fatal: no RDMA devices found\n");
-               ret = ERR(ENODEV);
-               goto err2;
-       }
-@@ -279,7 +272,6 @@ static struct ibv_context *ucma_open_device(uint64_t guid)
- 
-       dev_list = ibv_get_device_list(NULL);
-       if (!dev_list) {
--              fprintf(stderr, PFX "Fatal: unable to get RDMA device list\n");
-               return NULL;
-       }
- 
-@@ -290,9 +282,6 @@ static struct ibv_context *ucma_open_device(uint64_t guid)
-               }
-       }
- 
--      if (!verbs)
--              fprintf(stderr, PFX "Fatal: unable to open RDMA device\n");
--
-       ibv_free_device_list(dev_list);
-       return verbs;
- }
-@@ -312,7 +301,6 @@ static int ucma_init_device(struct cma_device *cma_dev)
- 
-       ret = ibv_query_device(cma_dev->verbs, &attr);
-       if (ret) {
--              fprintf(stderr, PFX "Fatal: unable to query RDMA device\n");
-               ret = ERR(ret);
-               goto err;
-       }
-@@ -410,7 +398,6 @@ struct rdma_event_channel *rdma_create_event_channel(void)
- 
-       channel->fd = open("/dev/infiniband/rdma_cm", O_RDWR | O_CLOEXEC);
-       if (channel->fd < 0) {
--              fprintf(stderr, PFX "Fatal: unable to open /dev/infiniband/rdma_cm\n");
-               goto err;
-       }
-       return channel;