diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-17 11:58:05 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-17 11:58:05 +0000 |
| commit | 3b8dd62e91b426115c72d728ea12438682141e92 (patch) | |
| tree | f8b6c229e4e28f13c40ec12a7eef3c5b57298b99 /package/mountd/patches/020-handle_timeout.patch | |
| parent | 68e0aebc344f8c0fff66e0f885e092fc57e7b634 (diff) | |
| download | upstream-3b8dd62e91b426115c72d728ea12438682141e92.tar.gz upstream-3b8dd62e91b426115c72d728ea12438682141e92.tar.bz2 upstream-3b8dd62e91b426115c72d728ea12438682141e92.zip | |
[package] mountd: correctly handle poll() timeout case, solves possible 100% CPU load when idle (#7293)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27635 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mountd/patches/020-handle_timeout.patch')
| -rw-r--r-- | package/mountd/patches/020-handle_timeout.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/mountd/patches/020-handle_timeout.patch b/package/mountd/patches/020-handle_timeout.patch new file mode 100644 index 0000000000..badf40fe4d --- /dev/null +++ b/package/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)); ++ } + } + } + |