From 61aba42d5c9e2784e4c83c44f817426b3b9bf48a Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 17 Jul 2011 11:58:05 +0000
Subject: mountd: correctly handle poll() timeout case, solves possible 100%
CPU load when idle (#7293)
SVN-Revision: 27635
---
package/mountd/patches/020-handle_timeout.patch | 32 +++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 package/mountd/patches/020-handle_timeout.patch
(limited to 'package/mountd/patches')
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));
++ }
+ }
+ }
+
--
cgit v1.2.3