diff mbox series

[ndctl,v2,26/26] ndctl/monitor: Allow monitor to be manually moved to the background

Message ID 156426369946.531577.16184152092730982222.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive)
State Superseded
Headers show
Series Improvements for namespace creation/interrogation | expand

Commit Message

Dan Williams July 27, 2019, 9:41 p.m. UTC 
Currently attempting to place the monitor into the background results in
an epoll error:

    # ndctl monitor -b nfit_test.0
    ^Z
    [1]+  Stopped                 ndctl monitor -b nfit_test.0
    # bg
    [1]+ ndctl monitor -b nfit_test.0 &
    epoll_wait error

This error is simply a wakeup from a signal EINTR, so allow the monitor
to continue assuming the signal is not fatal.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 ndctl/monitor.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/ndctl/monitor.c b/ndctl/monitor.c
index 6829a6b28b58..88adf3e5d6ff 100644
--- a/ndctl/monitor.c
+++ b/ndctl/monitor.c
@@ -357,8 +357,8 @@  static int monitor_event(struct ndctl_ctx *ctx,
 	while (1) {
 		did_fail = 0;
 		nfds = epoll_wait(epollfd, events, mfa->num_dimm, -1);
-		if (nfds <= 0) {
-			err(&monitor, "epoll_wait error\n");
+		if (nfds <= 0 && errno != EINTR) {
+			err(&monitor, "epoll_wait error: (%s)\n", strerror(errno));
 			rc = -errno;
 			goto out;
 		}