Commit f6febf2c authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds

[PATCH] s390: z/VM watchdog driver bugfix.

From: Gerald Schaefer <geraldsc@de.ibm.com>

 - Remove ESPIPE logic, use nonseekable_open() instead.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 10c34e58
...@@ -168,7 +168,7 @@ static int vmwdt_open(struct inode *i, struct file *f) ...@@ -168,7 +168,7 @@ static int vmwdt_open(struct inode *i, struct file *f)
ret = vmwdt_keepalive(); ret = vmwdt_keepalive();
if (ret) if (ret)
clear_bit(0, &vmwdt_is_open); 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) static int vmwdt_close(struct inode *i, struct file *f)
...@@ -238,10 +238,6 @@ static int vmwdt_ioctl(struct inode *i, struct file *f, ...@@ -238,10 +238,6 @@ static int vmwdt_ioctl(struct inode *i, struct file *f,
static ssize_t vmwdt_write(struct file *f, const char __user *buf, static ssize_t vmwdt_write(struct file *f, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
/* We can't seek */
if(ppos != &f->f_pos)
return -ESPIPE;
if(count) { if(count) {
if (!vmwdt_nowayout) { if (!vmwdt_nowayout) {
size_t i; size_t i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment