[PATCH] IPMI: return correct value from ipmi_write

[PATCH] IPMI: return correct value from ipmi_write

[Mark Rustad]

From: Mark Rustad <MRustad@gmail.com>

This patch corrects the handling of write operations to the IPMI watchdog
to work as intended by returning the number of characters actually
processed. Without this patch, an "echo V >/dev/watchdog" enables the
watchdog if IPMI is providing the watchdog function.

Signed-off-by: Mark Rustad <MRustad@gmail.com>
---
I have not checked all of the watchdogs to see if there are others that have
this problem, but the one I was using before using the IPMI one did work
right. It was also a big surprise how much the default watchdog timeout
varies from one to another. Let me tell you that the 10 second default
for the IPMI watchdog was a real sore spot while tracking this problem down!
This problem goes back at least as far as 2.6.20, but I generated this patch
based on 2.6.26-rc9. I have applied, compiled and tested this fix.

 drivers/char/ipmi/ipmi_watchdog.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/drivers/char/ipmi/ipmi_watchdog.c	2008-07-10 09:31:52.000000000 -0500
+++ b/drivers/char/ipmi/ipmi_watchdog.c	2008-07-10 09:33:41.000000000 -0500
@@ -755,9 +755,8 @@ static ssize_t ipmi_write(struct file *f
 		rv = ipmi_heartbeat();
 		if (rv)
 			return rv;
-		return 1;
 	}
-	return 0;
+	return len;
 }
 
 static ssize_t ipmi_read(struct file *file,

Re: [Openipmi-developer] [PATCH] IPMI: return correct value from ipmi_write

[Corey Minyard]

This patch is correct.

Signed-off-by: Corey Minyard <cminyard@mvista.com>

Mark Rustad wrote:
> From: Mark Rustad <MRustad@gmail.com>
>
> This patch corrects the handling of write operations to the IPMI watchdog
> to work as intended by returning the number of characters actually
> processed. Without this patch, an "echo V >/dev/watchdog" enables the
> watchdog if IPMI is providing the watchdog function.
>
> Signed-off-by: Mark Rustad <MRustad@gmail.com>
> ---
> I have not checked all of the watchdogs to see if there are others that have
> this problem, but the one I was using before using the IPMI one did work
> right. It was also a big surprise how much the default watchdog timeout
> varies from one to another. Let me tell you that the 10 second default
> for the IPMI watchdog was a real sore spot while tracking this problem down!
> This problem goes back at least as far as 2.6.20, but I generated this patch
> based on 2.6.26-rc9. I have applied, compiled and tested this fix.
>
>  drivers/char/ipmi/ipmi_watchdog.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> --- a/drivers/char/ipmi/ipmi_watchdog.c	2008-07-10 09:31:52.000000000 -0500
> +++ b/drivers/char/ipmi/ipmi_watchdog.c	2008-07-10 09:33:41.000000000 -0500
> @@ -755,9 +755,8 @@ static ssize_t ipmi_write(struct file *f
>  		rv = ipmi_heartbeat();
>  		if (rv)
>  			return rv;
> -		return 1;
>  	}
> -	return 0;
> +	return len;
>  }
>  
>  static ssize_t ipmi_read(struct file *file,
>
> -------------------------------------------------------------------------
> Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
> Studies have shown that voting for your favorite open source project,
> along with a healthy diet, reduces your potential for chronic lameness
> and boredom. Vote Now at http://www.sourceforge.net/community/cca08
> _______________________________________________
> Openipmi-developer mailing list
> Openipmi-developer@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openipmi-developer
>   

Re: [Openipmi-developer] [PATCH] IPMI: return correct value from ipmi_write

[Wim Van Sebroeck]

Hi All,

> This patch is correct.
> 
> Signed-off-by: Corey Minyard <cminyard@mvista.com>
> 
> Mark Rustad wrote:
> >From: Mark Rustad <MRustad@gmail.com>
> >
> >This patch corrects the handling of write operations to the IPMI watchdog
> >to work as intended by returning the number of characters actually
> >processed. Without this patch, an "echo V >/dev/watchdog" enables the
> >watchdog if IPMI is providing the watchdog function.
> >
> >Signed-off-by: Mark Rustad <MRustad@gmail.com>

I'll add this to he linux-2.6-watchdog tree this evening so that Linus can pull.

Greetings,
Wim.