Changeset 745 for trunk/server/source3/modules/onefs_system.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/onefs_system.c (modified) (2 diffs)

trunk/server/source3/modules/onefs_system.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 #include "onefs_config.h"
@@ -270 +271 @@
                         ret = sendfile(fromfd, tofd, offset, total, &hdr,
                                        &nwritten, flags);
-                } while (ret == -1 && errno == EINTR);
+#if defined(EWOULDBLOCK)
+                } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+                } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
 
                 /* On error we're done. */