pop

diff --git a/meta b/meta
index 2c0dd7faeab4ec692f02d3f5797a78d86fab5275..90fb34d94837397bde2ec8961aebef0a9a827e6e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 931bff4c33dccf8d88708ad03aa5df4cfa61c2c9
-Head: 7a864c043ccadf0a1279309ca25bb86afc9c59d6
+Previous: 6b96cb788b063a5ca03509e29b77ad588c66088b
+Head: 1807a69a7b99c85be8d06aad947ba677e26ef658
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -8,8 +8,8 @@ Applied:
   rs-qpsize: 7d55c2586721ac9cd745495d689f3bb3c42f1cb5
   rs-opts: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
   rs-opt-qpsize: 7a864c043ccadf0a1279309ca25bb86afc9c59d6
+  rs-opt-inline: 1807a69a7b99c85be8d06aad947ba677e26ef658
 Unapplied:
-  rs-opt-inline: b624fedb7c85a3fa5b4911ebfe56815470248832
   pre-qpsize: 1d27a538d708554284968f9bf71cbe59fe5caead
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6

diff --git a/patches/rs-opt-inline b/patches/rs-opt-inline
index b89e37cb48797343067c2746975f39ac8c56ba81..6b9f2d4cf10a46d62f8b821804d6b164aa3daf2f 100644 (file)
--- a/patches/rs-opt-inline
+++ b/patches/rs-opt-inline
@@ -1,5 +1,5 @@
-Bottom: 802cf3a8498258b521ee1e4f058de10033261d48
-Top:    92d3cde2ac0d83630c3f7f2c7e438da3bc5daa28
+Bottom: 72f7a43b64f1274756d81e397fc2c110bf58532b
+Top:    8741a1d852238e29ca2c917ec275c4bdc651f38f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-22 11:39:21 -0700
 
@@ -29,7 +29,7 @@ index 9fd9929..65feda9 100644
  
  int rsetsockopt(int socket, int level, int optname,
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 78d7338..d68cb56 100644
+index f94e48a..ef070a8 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -105,6 +105,7 @@ struct rs_sge {
@@ -71,7 +71,7 @@ index 78d7338..d68cb56 100644
  
        ret = rdma_create_qp(rs->cm_id, NULL, &qp_attr);
        if (ret)
-@@ -1141,7 +1145,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
+@@ -1156,7 +1160,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
                if (xfer_size > rs->target_sgl[rs->target_sge].length)
                        xfer_size = rs->target_sgl[rs->target_sge].length;
  
@@ -80,7 +80,7 @@ index 78d7338..d68cb56 100644
                        sge.addr = (uintptr_t) buf;
                        sge.length = xfer_size;
                        sge.lkey = 0;
-@@ -1257,7 +1261,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
+@@ -1277,7 +1281,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
                        ret = rs_write_data(rs, rs_wrid(1, xfer_size),
                                            rs->ssgl, 1,
                                            rs_msg_set(RS_OP_DATA, xfer_size),
@@ -89,7 +89,7 @@ index 78d7338..d68cb56 100644
                        if (xfer_size < rs_sbuf_left(rs))
                                rs->ssgl[0].addr += xfer_size;
                        else
-@@ -1271,7 +1275,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
+@@ -1291,7 +1295,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
                        ret = rs_write_data(rs, rs_wrid(1, xfer_size),
                                            rs->ssgl, 2,
                                            rs_msg_set(RS_OP_DATA, xfer_size),
@@ -98,7 +98,7 @@ index 78d7338..d68cb56 100644
                        rs->ssgl[0].addr = (uintptr_t) rs->sbuf + rs->ssgl[1].length;
                }
                if (ret)
-@@ -1710,6 +1714,11 @@ int rsetsockopt(int socket, int level, int optname,
+@@ -1730,6 +1734,11 @@ int rsetsockopt(int socket, int level, int optname,
                case RDMA_RQSIZE:
                        rs->rq_size = min((*(uint32_t *) optval), RS_QP_MAX_SIZE);
                        break;
@@ -110,7 +110,7 @@ index 78d7338..d68cb56 100644
                default:
                        break;
                }
-@@ -1789,6 +1798,10 @@ int rgetsockopt(int socket, int level, int optname,
+@@ -1809,6 +1818,10 @@ int rgetsockopt(int socket, int level, int optname,
                        *((int *) optval) = rs->rq_size;
                        *optlen = sizeof(int);
                        break;