diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-12-07 06:52:23 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2009-12-07 06:51:39 -0500 |
commit | 3b47f9d5ec646bc50148c664ce5895ff9837699f (patch) | |
tree | 19817b12ba3fe3e7e9dd52e247b60a515cb55d42 /drivers/s390 | |
parent | 3c492d2033f4c67e967e85ff46b8ebac0c5c4036 (diff) |
[S390] vmlogrdr: remove BKL
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/char/vmlogrdr.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c index d1a142fa3eb4..899aa795bf38 100644 --- a/drivers/s390/char/vmlogrdr.c +++ b/drivers/s390/char/vmlogrdr.c | |||
@@ -312,11 +312,9 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp) | |||
312 | return -ENOSYS; | 312 | return -ENOSYS; |
313 | 313 | ||
314 | /* Besure this device hasn't already been opened */ | 314 | /* Besure this device hasn't already been opened */ |
315 | lock_kernel(); | ||
316 | spin_lock_bh(&logptr->priv_lock); | 315 | spin_lock_bh(&logptr->priv_lock); |
317 | if (logptr->dev_in_use) { | 316 | if (logptr->dev_in_use) { |
318 | spin_unlock_bh(&logptr->priv_lock); | 317 | spin_unlock_bh(&logptr->priv_lock); |
319 | unlock_kernel(); | ||
320 | return -EBUSY; | 318 | return -EBUSY; |
321 | } | 319 | } |
322 | logptr->dev_in_use = 1; | 320 | logptr->dev_in_use = 1; |
@@ -360,9 +358,8 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp) | |||
360 | || (logptr->iucv_path_severed)); | 358 | || (logptr->iucv_path_severed)); |
361 | if (logptr->iucv_path_severed) | 359 | if (logptr->iucv_path_severed) |
362 | goto out_record; | 360 | goto out_record; |
363 | ret = nonseekable_open(inode, filp); | 361 | nonseekable_open(inode, filp); |
364 | unlock_kernel(); | 362 | return 0; |
365 | return ret; | ||
366 | 363 | ||
367 | out_record: | 364 | out_record: |
368 | if (logptr->autorecording) | 365 | if (logptr->autorecording) |
@@ -372,7 +369,6 @@ out_path: | |||
372 | logptr->path = NULL; | 369 | logptr->path = NULL; |
373 | out_dev: | 370 | out_dev: |
374 | logptr->dev_in_use = 0; | 371 | logptr->dev_in_use = 0; |
375 | unlock_kernel(); | ||
376 | return -EIO; | 372 | return -EIO; |
377 | } | 373 | } |
378 | 374 | ||