diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-06-11 05:57:58 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-06-11 05:57:58 +0000 |
| commit | b28cc4163bc2faaa80c5782fc02c8f03c410cdeb (patch) | |
| tree | 58a5eda9a58f43d9f6bad4f7037ee852f69bf00e /source/lib/util_sock.c | |
| parent | 1871d4a3f64401f9a6f749ce26d1715e3bcdeac3 (diff) | |
| download | samba-b28cc4163bc2faaa80c5782fc02c8f03c410cdeb.tar.gz samba-b28cc4163bc2faaa80c5782fc02c8f03c410cdeb.tar.xz samba-b28cc4163bc2faaa80c5782fc02c8f03c410cdeb.zip | |
Linux kernel oplocks now seem to work, but need a _lot_ of testing
I had to modify sys_select() to not loop on EINTR. I added a wrapper
called sys_select_intr() which gives the old behaviour.
Diffstat (limited to 'source/lib/util_sock.c')
| -rw-r--r-- | source/lib/util_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c index bb62442bebb..e6aef16d16d 100644 --- a/source/lib/util_sock.c +++ b/source/lib/util_sock.c @@ -241,7 +241,7 @@ static ssize_t read_socket_with_timeout(int fd,char *buf,size_t mincnt,size_t ma FD_ZERO(&fds); FD_SET(fd,&fds); - selrtn = sys_select(fd+1,&fds,&timeout); + selrtn = sys_select_intr(fd+1,&fds,&timeout); /* Check if error */ if(selrtn == -1) { @@ -345,7 +345,7 @@ ssize_t read_with_timeout(int fd,char *buf,size_t mincnt,size_t maxcnt,unsigned FD_ZERO(&fds); FD_SET(fd,&fds); - selrtn = sys_select(fd+1,&fds,&timeout); + selrtn = sys_select_intr(fd+1,&fds,&timeout); if(selrtn <= 0) return selrtn; |