Linux Watchdog driver development
 help / color / mirror / Atom feed
* RE: RE: [PATCH] watchdog: only print critical log when the watchdog fails to be stopped
@ 2025-01-27  9:35 liuchao (CR)
  2025-01-27 14:29 ` Guenter Roeck
  0 siblings, 1 reply; 2+ messages in thread
From: liuchao (CR) @ 2025-01-27  9:35 UTC (permalink / raw)
  To: Guenter Roeck, wim@linux-watchdog.org,
	linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
  Cc: caihe, lixiaokeng

On 1/26/25 21:10, Guenter Roeck wrote:
> On 1/26/25 00:38, Liu Chao wrote:
> > Every time the user echoes 0 > /dev/watchdog0, meaningless critical
> > log is printed.
> >
> 
> It is not meaningless, and it will still be displayed after this change, making the
> change pointless.

The change is not pointless. For example, the softdog driver does not invoke 
watchdog_stop or print logs in the watchdog_release.

Liu Chao

> 
> Guenter
> 
> > Signed-off-by: Liu Chao <liuchao173@huawei.com>
> > ---
> >   drivers/watchdog/watchdog_dev.c | 9 +++++----
> >   1 file changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/watchdog/watchdog_dev.c
> > b/drivers/watchdog/watchdog_dev.c index e2bd266b1b5b..0a9d5e6f3a88
> > 100644
> > --- a/drivers/watchdog/watchdog_dev.c
> > +++ b/drivers/watchdog/watchdog_dev.c
> > @@ -960,14 +960,15 @@ static int watchdog_release(struct inode *inode,
> struct file *file)
> >   	if (!watchdog_active(wdd))
> >   		err = 0;
> >   	else if (test_and_clear_bit(_WDOG_ALLOW_RELEASE,
> &wd_data->status) ||
> > -		 !(wdd->info->options & WDIOF_MAGICCLOSE))
> > +		 !(wdd->info->options & WDIOF_MAGICCLOSE)) {
> >   		err = watchdog_stop(wdd);
> > +		if (err < 0)
> > +			pr_crit("watchdog%d: watchdog did not stop!\n", wdd->id);
> > +	}
> >
> >   	/* If the watchdog was not stopped, send a keepalive ping */
> > -	if (err < 0) {
> > -		pr_crit("watchdog%d: watchdog did not stop!\n", wdd->id);
> > +	if (err < 0)
> >   		watchdog_ping(wdd);
> > -	}
> >
> >   	watchdog_update_worker(wdd);
> >


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-01-27 14:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-27  9:35 RE: [PATCH] watchdog: only print critical log when the watchdog fails to be stopped liuchao (CR)
2025-01-27 14:29 ` Guenter Roeck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox