[S390] vmlogrdr: remove BKL
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 7 Dec 2009 11:52:23 +0000 (12:52 +0100)
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>
Mon, 7 Dec 2009 11:51:39 +0000 (12:51 +0100)
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/char/vmlogrdr.c

index d1a142fa3eb46c000fe00654aa43a1c5253102f3..899aa795bf38eef009cb08299b6a27b6d330fbe3 100644 (file)
@@ -312,11 +312,9 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
                return -ENOSYS;
 
        /* Besure this device hasn't already been opened */
-       lock_kernel();
        spin_lock_bh(&logptr->priv_lock);
        if (logptr->dev_in_use) {
                spin_unlock_bh(&logptr->priv_lock);
-               unlock_kernel();
                return -EBUSY;
        }
        logptr->dev_in_use = 1;
@@ -360,9 +358,8 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
                   || (logptr->iucv_path_severed));
        if (logptr->iucv_path_severed)
                goto out_record;
-       ret = nonseekable_open(inode, filp);
-       unlock_kernel();
-       return ret;
+       nonseekable_open(inode, filp);
+       return 0;
 
 out_record:
        if (logptr->autorecording)
@@ -372,7 +369,6 @@ out_path:
        logptr->path = NULL;
 out_dev:
        logptr->dev_in_use = 0;
-       unlock_kernel();
        return -EIO;
 }