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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
atm
/
resources.c
diff --git
a/net/atm/resources.c
b/net/atm/resources.c
index
529f7e6
..
2241905
100644
(file)
--- a/
net/atm/resources.c
+++ b/
net/atm/resources.c
@@
-8,6
+8,7
@@
* use the default destruct function initialized by sock_init_data */
* use the default destruct function initialized by sock_init_data */
+#include <linux/config.h>
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/atmdev.h>
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/atmdev.h>
@@
-17,8
+18,6
@@
#include <linux/bitops.h>
#include <linux/capability.h>
#include <linux/delay.h>
#include <linux/bitops.h>
#include <linux/capability.h>
#include <linux/delay.h>
-#include <linux/mutex.h>
-
#include <net/sock.h> /* for struct sock */
#include "common.h"
#include <net/sock.h> /* for struct sock */
#include "common.h"
@@
-27,15
+26,16
@@
LIST_HEAD(atm_devs);
LIST_HEAD(atm_devs);
-DE
FIN
E_MUTEX(atm_dev_mutex);
+DE
CLAR
E_MUTEX(atm_dev_mutex);
static struct atm_dev *__alloc_atm_dev(const char *type)
{
struct atm_dev *dev;
static struct atm_dev *__alloc_atm_dev(const char *type)
{
struct atm_dev *dev;
- dev = k
z
alloc(sizeof(*dev), GFP_KERNEL);
+ dev = k
m
alloc(sizeof(*dev), GFP_KERNEL);
if (!dev)
return NULL;
if (!dev)
return NULL;
+ memset(dev, 0, sizeof(*dev));
dev->type = type;
dev->signal = ATM_PHY_SIG_UNKNOWN;
dev->link_rate = ATM_OC3_PCR;
dev->type = type;
dev->signal = ATM_PHY_SIG_UNKNOWN;
dev->link_rate = ATM_OC3_PCR;
@@
-65,9
+65,9
@@
struct atm_dev *atm_dev_lookup(int number)
{
struct atm_dev *dev;
{
struct atm_dev *dev;
-
mutex_lock
(&atm_dev_mutex);
+
down
(&atm_dev_mutex);
dev = __atm_dev_lookup(number);
dev = __atm_dev_lookup(number);
-
mutex_unlock
(&atm_dev_mutex);
+
up
(&atm_dev_mutex);
return dev;
}
return dev;
}
@@
-83,11
+83,11
@@
struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
type);
return NULL;
}
type);
return NULL;
}
-
mutex_lock
(&atm_dev_mutex);
+
down
(&atm_dev_mutex);
if (number != -1) {
if ((inuse = __atm_dev_lookup(number))) {
atm_dev_put(inuse);
if (number != -1) {
if ((inuse = __atm_dev_lookup(number))) {
atm_dev_put(inuse);
-
mutex_unlock
(&atm_dev_mutex);
+
up
(&atm_dev_mutex);
kfree(dev);
return NULL;
}
kfree(dev);
return NULL;
}
@@
-112,27
+112,14
@@
struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
printk(KERN_ERR "atm_dev_register: "
"atm_proc_dev_register failed for dev %s\n",
type);
printk(KERN_ERR "atm_dev_register: "
"atm_proc_dev_register failed for dev %s\n",
type);
- goto out_fail;
- }
-
- if (atm_register_sysfs(dev) < 0) {
- printk(KERN_ERR "atm_dev_register: "
- "atm_register_sysfs failed for dev %s\n",
- type);
- atm_proc_dev_deregister(dev);
- goto out_fail;
+ up(&atm_dev_mutex);
+ kfree(dev);
+ return NULL;
}
}
-
list_add_tail(&dev->dev_list, &atm_devs);
list_add_tail(&dev->dev_list, &atm_devs);
+ up(&atm_dev_mutex);
-out:
- mutex_unlock(&atm_dev_mutex);
return dev;
return dev;
-
-out_fail:
- kfree(dev);
- dev = NULL;
- goto out;
}
}
@@
-146,12
+133,11
@@
void atm_dev_deregister(struct atm_dev *dev)
* with same number can appear, such we need deregister proc,
* release async all vccs and remove them from vccs list too
*/
* with same number can appear, such we need deregister proc,
* release async all vccs and remove them from vccs list too
*/
-
mutex_lock
(&atm_dev_mutex);
+
down
(&atm_dev_mutex);
list_del(&dev->dev_list);
list_del(&dev->dev_list);
-
mutex_unlock
(&atm_dev_mutex);
+
up
(&atm_dev_mutex);
atm_dev_release_vccs(dev);
atm_dev_release_vccs(dev);
- atm_unregister_sysfs(dev);
atm_proc_dev_deregister(dev);
atm_dev_put(dev);
atm_proc_dev_deregister(dev);
atm_dev_put(dev);
@@
-210,16
+196,16
@@
int atm_dev_ioctl(unsigned int cmd, void __user *arg)
return -EFAULT;
if (get_user(len, &iobuf->length))
return -EFAULT;
return -EFAULT;
if (get_user(len, &iobuf->length))
return -EFAULT;
-
mutex_lock
(&atm_dev_mutex);
+
down
(&atm_dev_mutex);
list_for_each(p, &atm_devs)
size += sizeof(int);
if (size > len) {
list_for_each(p, &atm_devs)
size += sizeof(int);
if (size > len) {
-
mutex_unlock
(&atm_dev_mutex);
+
up
(&atm_dev_mutex);
return -E2BIG;
}
tmp_buf = kmalloc(size, GFP_ATOMIC);
if (!tmp_buf) {
return -E2BIG;
}
tmp_buf = kmalloc(size, GFP_ATOMIC);
if (!tmp_buf) {
-
mutex_unlock
(&atm_dev_mutex);
+
up
(&atm_dev_mutex);
return -ENOMEM;
}
tmp_p = tmp_buf;
return -ENOMEM;
}
tmp_p = tmp_buf;
@@
-227,7
+213,7
@@
int atm_dev_ioctl(unsigned int cmd, void __user *arg)
dev = list_entry(p, struct atm_dev, dev_list);
*tmp_p++ = dev->number;
}
dev = list_entry(p, struct atm_dev, dev_list);
*tmp_p++ = dev->number;
}
-
mutex_unlock
(&atm_dev_mutex);
+
up
(&atm_dev_mutex);
error = ((copy_to_user(buf, tmp_buf, size)) ||
put_user(size, &iobuf->length))
? -EFAULT : 0;
error = ((copy_to_user(buf, tmp_buf, size)) ||
put_user(size, &iobuf->length))
? -EFAULT : 0;
@@
-414,13
+400,13
@@
static __inline__ void *dev_get_idx(loff_t left)
void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos)
{
void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos)
{
-
mutex_lock
(&atm_dev_mutex);
+
down
(&atm_dev_mutex);
return *pos ? dev_get_idx(*pos) : (void *) 1;
}
void atm_dev_seq_stop(struct seq_file *seq, void *v)
{
return *pos ? dev_get_idx(*pos) : (void *) 1;
}
void atm_dev_seq_stop(struct seq_file *seq, void *v)
{
-
mutex_unlock
(&atm_dev_mutex);
+
up
(&atm_dev_mutex);
}
void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
}
void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)