* [patch 2/2] s390: z/VM watchdog driver bugfix.
@ 2004-12-16 8:22 Heiko Carstens
0 siblings, 0 replies; only message in thread
From: Heiko Carstens @ 2004-12-16 8:22 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Gerald Schaefer
[patch 2/2] s390: z/VM watchdog driver bugfix.
From: Gerald Schaefer <geraldsc@de.ibm.com>
- Remove ESPIPE logic, use nonseekable_open() instead.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
diffstat:
drivers/s390/char/vmwatchdog.c | 6 +-----
1 files changed, 1 insertion(+), 5 deletions(-)
diff -urN linux-2.6/drivers/s390/char/vmwatchdog.c linux-2.6-patched/drivers/s390/char/vmwatchdog.c
--- linux-2.6/drivers/s390/char/vmwatchdog.c 2004-12-16 08:52:03.000000000 +0100
+++ linux-2.6-patched/drivers/s390/char/vmwatchdog.c 2004-12-16 08:52:24.000000000 +0100
@@ -168,7 +168,7 @@
ret = vmwdt_keepalive();
if (ret)
clear_bit(0, &vmwdt_is_open);
- return ret;
+ return ret ? ret : nonseekable_open(i, f);
}
static int vmwdt_close(struct inode *i, struct file *f)
@@ -238,10 +238,6 @@
static ssize_t vmwdt_write(struct file *f, const char __user *buf,
size_t count, loff_t *ppos)
{
- /* We can't seek */
- if(ppos != &f->f_pos)
- return -ESPIPE;
-
if(count) {
if (!vmwdt_nowayout) {
size_t i;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-12-16 8:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-12-16 8:22 [patch 2/2] s390: z/VM watchdog driver bugfix Heiko Carstens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome