Skip to contentSkip to conversation

s390: z/VM watchdog driver bugfix.

PATCH New Heiko Carstens 1 participant 1 message Dec 16, 2004 s390

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 s390: z/VM watchdog driver bugfix.

[patch 2/2] s390: z/VM watchdog driver bugfix.

From: Gerald Schaefer <[email protected]>

- Remove ESPIPE logic, use nonseekable_open() instead.

diffstat:

 drivers/s390/char/vmwatchdog.c |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)
drivers/s390/char/vmwatchdog.c +1 -5
diff -urN linux-2.6/drivers/s390/char/vmwatchdog.c linux-2.6-patched/drivers/s390/char/vmwatchdog.c
@@ -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;