diff options
| author | John Crispin <blogic@openwrt.org> | 2013-06-21 16:54:37 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2013-06-21 16:54:37 +0000 |
| commit | f1b4824c865b228039d84b2605b2e7e4f34cddeb (patch) | |
| tree | 37c9cbe251e4fb790aaa72e862c35822be30b491 /package/system/mountd/patches/020-handle_timeout.patch | |
| parent | d2642de7494bba312bbb22cfeb3ad77130a10047 (diff) | |
| download | upstream-f1b4824c865b228039d84b2605b2e7e4f34cddeb.tar.gz upstream-f1b4824c865b228039d84b2605b2e7e4f34cddeb.tar.bz2 upstream-f1b4824c865b228039d84b2605b2e7e4f34cddeb.zip | |
packages: clean up the package folder
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37007 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/system/mountd/patches/020-handle_timeout.patch')
| -rw-r--r-- | package/system/mountd/patches/020-handle_timeout.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/system/mountd/patches/020-handle_timeout.patch b/package/system/mountd/patches/020-handle_timeout.patch new file mode 100644 index 0000000000..badf40fe4d --- /dev/null +++ b/package/system/mountd/patches/020-handle_timeout.patch @@ -0,0 +1,32 @@ +--- a/lib/autofs.c ++++ b/lib/autofs.c +@@ -140,6 +140,7 @@ static int fullread(void *ptr, size_t le + + static int autofs_in(union autofs_v5_packet_union *pkt) + { ++ int res; + struct pollfd fds[1]; + + fds[0].fd = fdout; +@@ -147,15 +148,19 @@ static int autofs_in(union autofs_v5_pac + + while(1) + { +- if(poll(fds, 2, 1000) == -1) ++ res = poll(fds, 1, -1); ++ ++ if (res == -1) + { + if (errno == EINTR) + continue; + log_printf("failed while trying to read packet from kernel\n"); + return -1; + } +- if(fds[0].revents & POLLIN) ++ else if ((res > 0) && (fds[0].revents & POLLIN)) ++ { + return fullread(pkt, sizeof(*pkt)); ++ } + } + } + |