From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 14 Aug 2012 23:48:25 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=97d917ef9fbf890f3f718e06439f8f3bdde88202;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index 71382fa9..ee325659 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 50b7bfb40bb218745d1154a4b7eb33f3edfff1d1
-Head: ffcd5bf3ba45f147e39402a749df9d5c97c794a3
+Previous: ab29a8fa7548a989aaf2f8c956cebb8104854d76
+Head: a957d5786c30dfb1da9cf9345e4a639f6006fbda
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -8,8 +8,7 @@ Applied:
   fork-pass: 9d661d643b62858fe119794e0ca41b5575faa0ce
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
-  fstat: a2d35a54a942cbbf75812253865bb76bacad9b6b
-  refresh-temp: ffcd5bf3ba45f147e39402a749df9d5c97c794a3
+  fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda
 Unapplied:
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
diff --git a/patches/fstat b/patches/fstat
index 9a2b2a40..e04d9856 100644
--- a/patches/fstat
+++ b/patches/fstat
@@ -1,5 +1,5 @@
 Bottom: 03b5e28f4ac8f642409cf46b6a2bfc0da609ec5d
-Top:    7272e42eaa5f911fa4e114b67fb12099a278a57d
+Top:    3f4ba48a611f719563dc773a1c33fbd391708df0
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 09:37:24 -0700
 
@@ -13,7 +13,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index c6cf176..cc2162a 100644
+index c6cf176..8f19af5 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -87,6 +87,7 @@ struct socket_calls {
@@ -32,7 +32,7 @@ index c6cf176..cc2162a 100644
  
  	rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
  	rs.bind = dlsym(RTLD_DEFAULT, "rbind");
-@@ -1033,3 +1035,17 @@ ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
+@@ -1033,3 +1035,18 @@ ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
  	munmap(file_addr, count);
  	return ret;
  }
@@ -41,6 +41,7 @@ index c6cf176..cc2162a 100644
 +{
 +	int fd, ret;
 +
++	init_preload();
 +	if (fd_get(socket, &fd) == fd_rsocket) {
 +		ret = real.fxstat(ver, socket, buf);
 +		if (!ret)
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 4806e861..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 7272e42eaa5f911fa4e114b67fb12099a278a57d
-Top:    3f4ba48a611f719563dc773a1c33fbd391708df0
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-14 16:48:24 -0700
-
-Refresh of fstat
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index cc2162a..8f19af5 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -1040,6 +1040,7 @@ int __fxstat(int ver, int socket, struct stat *buf)
- {
- 	int fd, ret;
- 
-+	init_preload();
- 	if (fd_get(socket, &fd) == fd_rsocket) {
- 		ret = real.fxstat(ver, socket, buf);
- 		if (!ret)