From 97642e5b2010c6bc35ae98396f904ed82887734f Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 10 Feb 2015 12:02:04 -0800
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |  5 +++--
 patches/refresh-temp | 52 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 3915e960..8ff9b531 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: fab2789732342caf9592f28dc1e36c6d3ace5bb3
-Head: 6d2b5c69aec1e7eed4a6113fd5aee02250f2881b
+Previous: eeb623b3f67c9fe5da701b43a72edd71b0bf8031
+Head: 7046c9315f158d33e7a54772522fdfd81d5ba1ad
 Applied:
   setfl: 6d2b5c69aec1e7eed4a6113fd5aee02250f2881b
+  refresh-temp: 7046c9315f158d33e7a54772522fdfd81d5ba1ad
 Unapplied:
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..4ff5d327
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,52 @@
+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);
-- 
2.46.0