refresh

diff --git a/meta b/meta
index 196f49ea16c685317a69c68027569c493881ddc0..d81e0a2594de58f614a8f18a8d6a59f077c93041 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: e6504f22a40e62493a95360aa81b3d8cf59b26ac
-Head: fa1dbfc2867be952dbfff7056767b8d31f4d2bac
+Previous: f6b9953e88cdd200aeb5bf9213a5cca870f39bc1
+Head: c4f4253dedaacc9fa27726bda6f1167b280576ad
 Applied:
-  rs-locking: bbc2e73cd81751d0504bba3e508a14972adce8be
-  refresh-temp: fa1dbfc2867be952dbfff7056767b8d31f4d2bac
+  rs-locking: c4f4253dedaacc9fa27726bda6f1167b280576ad
 Unapplied:
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4f4827b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: d4bd62f68b19a3992515a80d129cc327a1c971d8
-Top:    b2e4cd7d670a626fa22b05cff6a1dccc973e9f0d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-09 13:52:31 -0700
-
-Refresh of rs-locking
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 6d43373..2ffde9b 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -870,7 +870,7 @@ static int rs_process_cq(struct rsocket *rs, int nonblock, int (*test)(struct rs
-                       fastlock_release(&rs->cq_lock);
- 
-                       ret = rs_get_cq_event(rs);
--                      fastlock_release(&cq_wait_lock);
-+                      fastlock_release(&rs->cq_wait_lock);
-                       fastlock_acquire(&rs->cq_lock);
-               }
-       } while (!ret);

diff --git a/patches/rs-locking b/patches/rs-locking
index a05c5285ed29f34e3330bb722d0001eb01cae646..d78bafc68e28522827cf695804bed903441359dd 100644 (file)
--- a/patches/rs-locking
+++ b/patches/rs-locking
@@ -1,5 +1,5 @@
 Bottom: de666c51520c9988ea3a07e332fa0402fdef6010
-Top:    d4bd62f68b19a3992515a80d129cc327a1c971d8
+Top:    b2e4cd7d670a626fa22b05cff6a1dccc973e9f0d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-07 17:16:47 -0700
 
@@ -66,7 +66,7 @@ index 91528c0..f28020e 100644
  static inline int ERR(int err)
  {
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 775e9b0..6d43373 100644
+index 775e9b0..2ffde9b 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -141,11 +141,10 @@ enum rs_state {
@@ -174,7 +174,7 @@ index 775e9b0..6d43373 100644
 +                      fastlock_release(&rs->cq_lock);
 +
                        ret = rs_get_cq_event(rs);
-+                      fastlock_release(&cq_wait_lock);
++                      fastlock_release(&rs->cq_wait_lock);
 +                      fastlock_acquire(&rs->cq_lock);
                }
        } while (!ret);