openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ATM]: Use seq_open/release_privade instead of manual manipulations. 

lec_seq_open/lec_seq_release and __vcc_seq_open/vcc_seq_release
do seq_open/release_private's job.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2008-02-29 11:37:02 -08:00 committed by David S. Miller
parent 45af1754bc
commit 9a8c09e73b
2 changed files with 9 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/atm/lec.c
View File

@ -1169,32 +1169,7 @@ static const struct seq_operations lec_seq_ops = {
static int lec_seq_open(struct inode *inode, struct file *file) static int lec_seq_open(struct inode *inode, struct file *file)
{ {
struct lec_state *state; return seq_open_private(file, &lec_seq_ops, sizeof(struct lec_state));
struct seq_file *seq;
int rc = -EAGAIN;
state = kmalloc(sizeof(*state), GFP_KERNEL);
if (!state) {
rc = -ENOMEM;
goto out;
}
rc = seq_open(file, &lec_seq_ops);
if (rc)
goto out_kfree;
seq = file->private_data;
seq->private = state;
out:
return rc;
out_kfree:
kfree(state);
goto out;
}
static int lec_seq_release(struct inode *inode, struct file *file)
{
return seq_release_private(inode, file);
} }
static const struct file_operations lec_seq_fops = { static const struct file_operations lec_seq_fops = {
@ -1202,7 +1177,7 @@ static const struct file_operations lec_seq_fops = {
.open = lec_seq_open, .open = lec_seq_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = lec_seq_release, .release = seq_release_private,
}; };
#endif #endif

32
net/atm/proc.c
View File

@ -114,31 +114,13 @@ static int __vcc_seq_open(struct inode *inode, struct file *file,
int family, const struct seq_operations *ops) int family, const struct seq_operations *ops)
{ {
struct vcc_state *state; struct vcc_state *state;
struct seq_file *seq;
int rc = -ENOMEM;
state = kmalloc(sizeof(*state), GFP_KERNEL); state = __seq_open_private(file, ops, sizeof(*state));
if (!state) if (state == NULL)
goto out; return -ENOMEM;
rc = seq_open(file, ops);
if (rc)
goto out_kfree;
state->family = family; state->family = family;
return 0;
seq = file->private_data;
seq->private = state;
out:
return rc;
out_kfree:
kfree(state);
goto out;
}
static int vcc_seq_release(struct inode *inode, struct file *file)
{
return seq_release_private(inode, file);
} }
static void *vcc_seq_start(struct seq_file *seq, loff_t *pos) static void *vcc_seq_start(struct seq_file *seq, loff_t *pos)
@ -314,7 +296,7 @@ static const struct file_operations pvc_seq_fops = {
.open = pvc_seq_open, .open = pvc_seq_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = vcc_seq_release, .release = seq_release_private,
}; };
static int vcc_seq_show(struct seq_file *seq, void *v) static int vcc_seq_show(struct seq_file *seq, void *v)
@ -348,7 +330,7 @@ static const struct file_operations vcc_seq_fops = {
.open = vcc_seq_open, .open = vcc_seq_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = vcc_seq_release, .release = seq_release_private,
}; };
static int svc_seq_show(struct seq_file *seq, void *v) static int svc_seq_show(struct seq_file *seq, void *v)
@ -383,7 +365,7 @@ static const struct file_operations svc_seq_fops = {
.open = svc_seq_open, .open = svc_seq_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = vcc_seq_release, .release = seq_release_private,
}; };
static ssize_t proc_dev_atm_read(struct file *file, char __user *buf, static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,