[PATCH] tidy up chrdev_open

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>

1 files changed, 14 insertions, 7 deletions

diff --git a/fs/char_dev.c b/fs/char_dev.c
index 262fa10e213d..700697a72618 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -386,15 +386,22 @@ static int chrdev_open(struct inode *inode, struct file *filp)
         cdev_put(new);
         if (ret)
                 return ret;
+
+        ret = -ENXIO;
         filp->f_op = fops_get(p->ops);
-        if (!filp->f_op) {
-                cdev_put(p);
-                return -ENXIO;
-        }
-        if (filp->f_op->open)
+        if (!filp->f_op)
+                goto out_cdev_put;
+
+        if (filp->f_op->open) {
                 ret = filp->f_op->open(inode,filp);
-        if (ret)
-                cdev_put(p);
+                if (ret)
+                        goto out_cdev_put;
+        }
+
+        return 0;
+
+ out_cdev_put:
+        cdev_put(p);
         return ret;
 }