leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[S390] monreader: remove lock_kernel() from open() function

Browse Source 
The lock_kernel() calls in the open() function are unnecessary because
misc_register() is called last in module_init() and concurrent open()
calls are handled by other means.

Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Gerald Schaefer 2009-12-07 12:52:17 +01:00 committed by Martin Schwidefsky
parent 2da3cf9755
commit 1963403aae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/s390/char/monreader.c
View File

@ -12,7 +12,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -283,7 +282,6 @@ static int mon_open(struct inode *inode, struct file *filp)
/* /*
* only one user allowed * only one user allowed
*/ */
lock_kernel();
rc = -EBUSY; rc = -EBUSY;
if (test_and_set_bit(MON_IN_USE, &mon_in_use)) if (test_and_set_bit(MON_IN_USE, &mon_in_use))
goto out; goto out;
@ -321,7 +319,6 @@ static int mon_open(struct inode *inode, struct file *filp)
} }
filp->private_data = monpriv; filp->private_data = monpriv;
dev_set_drvdata(monreader_device, monpriv); dev_set_drvdata(monreader_device, monpriv);
unlock_kernel();
return nonseekable_open(inode, filp); return nonseekable_open(inode, filp);
out_path: out_path:
@ -331,7 +328,6 @@ out_priv:
out_use: out_use:
clear_bit(MON_IN_USE, &mon_in_use); clear_bit(MON_IN_USE, &mon_in_use);
out: out:
unlock_kernel();
return rc; return rc;
} }
@ -607,6 +603,10 @@ static int __init mon_init(void)
} }
dcss_mkname(mon_dcss_name, &user_data_connect[8]); dcss_mkname(mon_dcss_name, &user_data_connect[8]);
/*
* misc_register() has to be the last action in module_init(), because
* file operations will be available right after this.
*/
rc = misc_register(&mon_dev); rc = misc_register(&mon_dev);
if (rc < 0 ) if (rc < 0 )
goto out; goto out;