lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c
This commit is contained in:
David S. Miller
2008-11-06 22:43:03 -08:00
parent 61c9eaf900 4bab0ea1d4
commit 9eeda9abd1
739 changed files with 7279 additions and 6648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/message/fusion/mptctl.c
View File

@@ -559,12 +559,6 @@ mptctl_fasync(int fd, struct file *filep, int mode)
return ret;
}
static int
mptctl_release(struct inode *inode, struct file *filep)
{
return fasync_helper(-1, filep, 0, &async_queue);
}
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/*
* MPT ioctl handler
@@ -2706,7 +2700,6 @@ mptctl_hp_targetinfo(unsigned long arg)
static const struct file_operations mptctl_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.release = mptctl_release,
.fasync = mptctl_fasync,
.unlocked_ioctl = mptctl_ioctl,
#ifdef CONFIG_COMPAT

21
drivers/message/i2o/i2o_config.c
View File

@@ -1097,28 +1097,17 @@ static int cfg_fasync(int fd, struct file *fp, int on)
static int cfg_release(struct inode *inode, struct file *file)
{
ulong id = (ulong) file->private_data;
struct i2o_cfg_info *p1, *p2;
struct i2o_cfg_info *p, **q;
unsigned long flags;
lock_kernel();
p1 = p2 = NULL;
spin_lock_irqsave(&i2o_config_lock, flags);
for (p1 = open_files; p1;) {
if (p1->q_id == id) {
if (p1->fasync)
cfg_fasync(-1, file, 0);
if (p2)
p2->next = p1->next;
else
open_files = p1->next;
kfree(p1);
for (q = &open_files; (p = *q) != NULL; q = &p->next) {
if (p->q_id == id) {
*q = p->next;
kfree(p);
break;
}
p2 = p1;
p1 = p1->next;
}
spin_unlock_irqrestore(&i2o_config_lock, flags);
unlock_kernel();