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>

fs/char_dev.c

diff --git a/fs/char_dev.c b/fs/char_dev.c
index afc2bb6..94b5f60 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -368,6 +368,7 @@
  */
 static int chrdev_open(struct inode *inode, struct file *filp)
 {
+	const struct file_operations *fops;
 	struct cdev *p;
 	struct cdev *new = NULL;
 	int ret = 0;
@@ -400,10 +401,11 @@
 		return ret;
 
 	ret = -ENXIO;
-	filp->f_op = fops_get(p->ops);
-	if (!filp->f_op)
+	fops = fops_get(p->ops);
+	if (!fops)
 		goto out_cdev_put;
 
+	replace_fops(filp, fops);
 	if (filp->f_op->open) {
 		ret = filp->f_op->open(inode, filp);
 		if (ret)