From: Jonathan Corbet <corbet@lwn.net>
Date: Thu, 15 May 2008 18:01:56 +0000 (-0600)
Subject: ide-tape: cdev lock_kernel() pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~121
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=04f4ac9d1bb8a9103609ce8e927f8e98826ce339;p=linux-2.6-omap-h63xx.git

ide-tape: cdev lock_kernel() pushdown

->release() already has explicit lock_kernel() calls...

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 1e1f26331a2..a3d228302d2 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2421,9 +2421,12 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
 	if (i >= MAX_HWIFS * MAX_DRIVES)
 		return -ENXIO;
 
+	lock_kernel();
 	tape = ide_tape_chrdev_get(i);
-	if (!tape)
+	if (!tape) {
+		unlock_kernel();
 		return -ENXIO;
+	}
 
 	debug_log(DBG_CHRDEV, "Enter %s\n", __func__);
 
@@ -2482,10 +2485,12 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
 			}
 		}
 	}
+	unlock_kernel();
 	return 0;
 
 out_put_tape:
 	ide_tape_put(tape);
+	unlock_kernel();
 	return retval;
 }