git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify devpts_get_sb() failure exits
[safe/jmp/linux-2.6]
/
net
/
wanrouter
/
wanproc.c
diff --git
a/net/wanrouter/wanproc.c
b/net/wanrouter/wanproc.c
index
5bebe40
..
c44d96b
100644
(file)
--- a/
net/wanrouter/wanproc.c
+++ b/
net/wanrouter/wanproc.c
@@
-80,6
+80,7
@@
static struct proc_dir_entry *proc_router;
* Iterator
*/
static void *r_start(struct seq_file *m, loff_t *pos)
* Iterator
*/
static void *r_start(struct seq_file *m, loff_t *pos)
+ __acquires(kernel_lock)
{
struct wan_device *wandev;
loff_t l = *pos;
{
struct wan_device *wandev;
loff_t l = *pos;
@@
-101,6
+102,7
@@
static void *r_next(struct seq_file *m, void *v, loff_t *pos)
}
static void r_stop(struct seq_file *m, void *v)
}
static void r_stop(struct seq_file *m, void *v)
+ __releases(kernel_lock)
{
unlock_kernel();
}
{
unlock_kernel();
}
@@
-278,7
+280,7
@@
static const struct file_operations wandev_fops = {
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
- .
ioctl
= wanrouter_ioctl,
+ .
unlocked_ioctl
= wanrouter_ioctl,
};
/*
};
/*