refresh

diff --git a/meta b/meta
index 8ff9b531dad2a5a3065ea8065ade6539a1894cb0..2ee7d0c67c0d9bcfae8c76a6f69173a92861ab56 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: eeb623b3f67c9fe5da701b43a72edd71b0bf8031
-Head: 7046c9315f158d33e7a54772522fdfd81d5ba1ad
+Previous: d851f503af367fa6f59c67baaac8b36c2e596c8b
+Head: 5e78ef2974ae364cf7682919e5120a1e1bc2a807
 Applied:
-  setfl: 6d2b5c69aec1e7eed4a6113fd5aee02250f2881b
-  refresh-temp: 7046c9315f158d33e7a54772522fdfd81d5ba1ad
+  setfl: 5e78ef2974ae364cf7682919e5120a1e1bc2a807
 Unapplied:
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4ff5d32..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,52 +0,0 @@
-Bottom: 4b3715465e5fbbc65460a5c47049ba42e48710f2
-Top:    cc9fe9e0f61b120af8e519dd3c5c3802a7170a6e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2015-02-10 12:02:04 -0800
-
-Refresh of setfl
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 6e8f375..1055728 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -352,7 +352,7 @@ struct rsocket {
-       };
- 
-       int               opts;
--      long              fd_flags;
-+      int               fd_flags;
-       uint64_t          so_opts;
-       uint64_t          ipv6_opts;
-       void              *optval;
-@@ -610,7 +610,7 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs, int type)
-       return rs;
- }
- 
--static int rs_set_nonblocking(struct rsocket *rs, long arg)
-+static int rs_set_nonblocking(struct rsocket *rs, int arg)
- {
-       struct ds_qp *qp;
-       int ret = 0;
-@@ -3683,7 +3683,7 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
- {
-       struct rsocket *rs;
-       va_list args;
--      long param;
-+      int param;
-       int ret = 0;
- 
-       rs = idm_lookup(&idm, socket);
-@@ -3692,10 +3692,10 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
-       va_start(args, cmd);
-       switch (cmd) {
-       case F_GETFL:
--              ret = (int) rs->fd_flags;
-+              ret = rs->fd_flags;
-               break;
-       case F_SETFL:
--              param = va_arg(args, long);
-+              param = va_arg(args, int);
-               if ((rs->fd_flags & O_NONBLOCK) != (param & O_NONBLOCK))
-                       ret = rs_set_nonblocking(rs, param & O_NONBLOCK);

diff --git a/patches/setfl b/patches/setfl
index 17edc304fddc1f553dddc08efe5f6bfd55f6c9e7..6145754a3ad1b2d02a07c4eec9ae4f271414e74a 100644 (file)
--- a/patches/setfl
+++ b/patches/setfl
@@ -1,5 +1,5 @@
 Bottom: 4b3715465e5fbbc65460a5c47049ba42e48710f2
-Top:    4b3715465e5fbbc65460a5c47049ba42e48710f2
+Top:    cc9fe9e0f61b120af8e519dd3c5c3802a7170a6e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2015-02-10 11:55:12 -0800
 
@@ -13,4 +13,46 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 6e8f375..1055728 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -352,7 +352,7 @@ struct rsocket {
+       };
+ 
+       int               opts;
+-      long              fd_flags;
++      int               fd_flags;
+       uint64_t          so_opts;
+       uint64_t          ipv6_opts;
+       void              *optval;
+@@ -610,7 +610,7 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs, int type)
+       return rs;
+ }
+ 
+-static int rs_set_nonblocking(struct rsocket *rs, long arg)
++static int rs_set_nonblocking(struct rsocket *rs, int arg)
+ {
+       struct ds_qp *qp;
+       int ret = 0;
+@@ -3683,7 +3683,7 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
+ {
+       struct rsocket *rs;
+       va_list args;
+-      long param;
++      int param;
+       int ret = 0;
+ 
+       rs = idm_lookup(&idm, socket);
+@@ -3692,10 +3692,10 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
+       va_start(args, cmd);
+       switch (cmd) {
+       case F_GETFL:
+-              ret = (int) rs->fd_flags;
++              ret = rs->fd_flags;
+               break;
+       case F_SETFL:
+-              param = va_arg(args, long);
++              param = va_arg(args, int);
+               if ((rs->fd_flags & O_NONBLOCK) != (param & O_NONBLOCK))
+                       ret = rs_set_nonblocking(rs, param & O_NONBLOCK);