commit e84f9e57b90ca89664d733a7cef19aa7ccd832f3
author Al Viro <viro@zeniv.linux.org.uk> Sun Sep 22 14:17:15 2013 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Thu Oct 24 23:34:53 2013 -0400
tree 2766cbae82e38a4356b161a7f48abfd9e4db56ce
parent 7b00ed6fe6321547b9d51f5bfb30e7b5932e6889

consolidate the reassignments of ->f_op in ->open() instances

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

drivers/char/misc.c

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 190d4423..fd0f7c4 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -114,7 +114,7 @@
 	int minor = iminor(inode);
 	struct miscdevice *c;
 	int err = -ENODEV;
-	const struct file_operations *old_fops, *new_fops = NULL;
+	const struct file_operations *new_fops = NULL;
 
 	mutex_lock(&misc_mtx);
 	
@@ -141,17 +141,11 @@
 	}
 
 	err = 0;
-	old_fops = file->f_op;
-	file->f_op = new_fops;
+	replace_fops(file, new_fops);
 	if (file->f_op->open) {
 		file->private_data = c;
-		err=file->f_op->open(inode,file);
-		if (err) {
-			fops_put(file->f_op);
-			file->f_op = fops_get(old_fops);
-		}
+		err = file->f_op->open(inode,file);
 	}
-	fops_put(old_fops);
 fail:
 	mutex_unlock(&misc_mtx);
 	return err;