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

[PATCH] tidy up chrdev_open

Browse Source 
Use a single goto label for chrdev_put + return error cases.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Christoph Hellwig
2008-08-11 15:34:22 +02:00
committed by Al Viro
parent ca30bc9952
commit a518ab9329
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/char_dev.c
View File

@@ -386,15 +386,22 @@ static int chrdev_open(struct inode *inode, struct file *filp)
cdev_put(new); cdev_put(new);
if (ret) if (ret)
return ret; return ret;
ret = -ENXIO;
filp->f_op = fops_get(p->ops); filp->f_op = fops_get(p->ops);
if (!filp->f_op) { if (!filp->f_op)
cdev_put(p); goto out_cdev_put;
return -ENXIO;
} if (filp->f_op->open) {
if (filp->f_op->open)
ret = filp->f_op->open(inode,filp); ret = filp->f_op->open(inode,filp);
if (ret) if (ret)
cdev_put(p); goto out_cdev_put;
}
return 0;
out_cdev_put:
cdev_put(p);
return ret; return ret;
} }