watchdog: core: propagate ping error code to the user space
From: Alexander Usyskin <[email protected]>
Watchdog ping return errors are ignored by watchdog core, Whatchdog daemon should be informed about possible hardware error or underlaying device driver get unregistered.
Signed-off-by Alexander Usyskin <[email protected]>
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/watchdog/watchdog_dev.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/watchdog/watchdog_dev.c +8 -4
@@ -295,6 +295,7 @@ static ssize_t watchdog_write(struct file *file, const char __user *data,struct watchdog_device *wdd = file->private_data;size_t i;char c; +int err;if (len ==0 )return 0 ;
@@ -314,7 +315,9 @@ static ssize_t watchdog_write(struct file *file, const char __user *data, }/* someone wrote to us, so we send the watchdog a keepalive ping */ -watchdog_ping (wdd); + err =watchdog_ping (wdd); +if (err <0 ) +return err;return len; }
@@ -370,8 +373,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,case WDIOC_KEEPALIVE :if (!(wdd->info->options &WDIOF_KEEPALIVEPING ))return -EOPNOTSUPP ; -watchdog_ping (wdd); -return 0 ; +return watchdog_ping (wdd);case WDIOC_SETTIMEOUT :if (get_user (val, p))return -EFAULT ;
@@ -381,7 +383,9 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,/* If the watchdog is active then we send a keepalive ping * to make sure that the watchdog keep's running (and if * possible that it takes the new timeout) */ -watchdog_ping (wdd); + err =watchdog_ping (wdd); +if (err <0 ) +return err;/* Fall */ case WDIOC_GETTIMEOUT :/* timeout == 0 means that we don't know the timeout */
Signature · 1 line
2.4.3
Quoted 8 lines · Tomas Winkler
From: Alexander Usyskin <[email protected]>
Watchdog ping return errors are ignored by watchdog core, Whatchdog daemon should be informed about possible hardware error or underlaying device driver get unregistered.
Signed-off-by Alexander Usyskin <[email protected]>Signed-off-by Tomas Winkler <[email protected]>
Makes sense to me, so
Reviewed-by Guenter Roeck <[email protected]>
I do wonder, though, if there was a reason for ignoring the result from the ping operation, or if that is purely historic.
Guenter
Quoted 55 lines
--- drivers/watchdog/watchdog_dev.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)drivers/watchdog/watchdog_dev.c +8
-4@@ -295,6 +295,7 @@ static ssize_t watchdog_write(struct file *file, const char __user *data,struct watchdog_device *wdd = file->private_data;size_t i;char c; +int err;if (len ==0 )return 0 ;@@ -314,7 +315,9 @@ static ssize_t watchdog_write(struct file *file, const char __user *data, }/* someone wrote to us, so we send the watchdog a keepalive ping */ -watchdog_ping (wdd); + err =watchdog_ping (wdd); +if (err <0 ) +return err;return len; }@@ -370,8 +373,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,case WDIOC_KEEPALIVE :if (!(wdd->info->options &WDIOF_KEEPALIVEPING ))return -EOPNOTSUPP ; -watchdog_ping (wdd); -return 0 ; +return watchdog_ping (wdd);case WDIOC_SETTIMEOUT :if (get_user (val, p))return -EFAULT ;@@ -381,7 +383,9 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,/* If the watchdog is active then we send a keepalive ping * to make sure that the watchdog keep's running (and if * possible that it takes the new timeout) */ -watchdog_ping (wdd); + err =watchdog_ping (wdd); +if (err <0 ) +return err;/* Fall */ case WDIOC_GETTIMEOUT :/* timeout == 0 means that we don't know the timeout */ Signature · 6 lines
2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html