refresh

diff --git a/meta b/meta
index 7c820f6eeeeda71465365f38726119ffba5a88b0..a70c8295fdeb11aee0b3a738fa5ab35d5a63a5d6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: a65c4ab020102604da34884bb08d7ec9a9af7f74
-Head: 22cde413882f4c01a549b1ce88fe9579a351fa0d
+Previous: 5302c3c49ba249e5e0c99e0717b0856f4136a3ae
+Head: dacc495f23ea3719bc98a8a6c148771d5097caf0
 Applied:
-  nonblock: 4589e78579e834b53d583ab1aee2f9566ea722d2
-  refresh-temp: 22cde413882f4c01a549b1ce88fe9579a351fa0d
+  nonblock: dacc495f23ea3719bc98a8a6c148771d5097caf0
 Unapplied:
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/nonblock b/patches/nonblock
index b1604e78a9a0d35858781626cbc7d9659fc8e5e2..6df08610c32b4dd9f667f32a89be9b622a6f49b1 100644 (file)
--- a/patches/nonblock
+++ b/patches/nonblock
@@ -1,5 +1,5 @@
 Bottom: bc6e27468c0f7e18f8977628c2581cff36914899
-Top:    bc6e27468c0f7e18f8977628c2581cff36914899
+Top:    4b3715465e5fbbc65460a5c47049ba42e48710f2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2015-02-05 21:17:03 -0800
 
@@ -15,4 +15,22 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 4ff3a42..6e8f375 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -3696,11 +3696,11 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
+               break;
+       case F_SETFL:
+               param = va_arg(args, long);
+-              if (param & O_NONBLOCK)
+-                      ret = rs_set_nonblocking(rs, O_NONBLOCK);
++              if ((rs->fd_flags & O_NONBLOCK) != (param & O_NONBLOCK))
++                      ret = rs_set_nonblocking(rs, param & O_NONBLOCK);
+ 
+               if (!ret)
+-                      rs->fd_flags |= param;
++                      rs->fd_flags = param;
+               break;
+       default:
+               ret = ERR(ENOTSUP);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 712814a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,28 +0,0 @@
-Bottom: bc6e27468c0f7e18f8977628c2581cff36914899
-Top:    4b3715465e5fbbc65460a5c47049ba42e48710f2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2015-02-05 21:23:13 -0800
-
-Refresh of nonblock
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 4ff3a42..6e8f375 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -3696,11 +3696,11 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
-               break;
-       case F_SETFL:
-               param = va_arg(args, long);
--              if (param & O_NONBLOCK)
--                      ret = rs_set_nonblocking(rs, O_NONBLOCK);
-+              if ((rs->fd_flags & O_NONBLOCK) != (param & O_NONBLOCK))
-+                      ret = rs_set_nonblocking(rs, param & O_NONBLOCK);
- 
-               if (!ret)
--                      rs->fd_flags |= param;
-+                      rs->fd_flags = param;
-               break;
-       default:
-               ret = ERR(ENOTSUP);