git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
um
/
drivers
/
harddog_kern.c
diff --git
a/arch/um/drivers/harddog_kern.c
b/arch/um/drivers/harddog_kern.c
index
2a4c8cf
..
147ec19
100644
(file)
--- a/
arch/um/drivers/harddog_kern.c
+++ b/
arch/um/drivers/harddog_kern.c
@@
-71,7
+71,7
@@
static int harddog_open(struct inode *inode, struct file *file)
if(timer_alive)
return -EBUSY;
#ifdef CONFIG_HARDDOG_NOWAYOUT
if(timer_alive)
return -EBUSY;
#ifdef CONFIG_HARDDOG_NOWAYOUT
-
MOD_INC_USE_COUNT
;
+
__module_get(THIS_MODULE)
;
#endif
#ifdef CONFIG_MCONSOLE
#endif
#ifdef CONFIG_MCONSOLE
@@
-82,7
+82,7
@@
static int harddog_open(struct inode *inode, struct file *file)
timer_alive = 1;
unlock_kernel();
timer_alive = 1;
unlock_kernel();
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
extern void stop_watchdog(int in_fd, int out_fd);
}
extern void stop_watchdog(int in_fd, int out_fd);
@@
-108,10
+108,6
@@
extern int ping_watchdog(int fd);
static ssize_t harddog_write(struct file *file, const char *data, size_t len,
loff_t *ppos)
{
static ssize_t harddog_write(struct file *file, const char *data, size_t len,
loff_t *ppos)
{
- /* Can't seek (pwrite) on this device */
- if (ppos != &file->f_pos)
- return -ESPIPE;
-
/*
* Refresh the timer.
*/
/*
* Refresh the timer.
*/