aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-10-14 11:48:38 -0400
committerIngo Molnar <mingo@elte.hu>2009-10-14 11:54:03 -0400
commit83cb16727085b18191f45eb0ede6bf1f97d67a7a (patch)
tree5103ae4ee83c22e76f57f1a46700f074d7d51309
parent55e858c8483af427144f33b42b818b30612b82b0 (diff)
nvram: Drop the BKL from nvram_open()
It's safe to remove the BKL from nvram_open(): there's no open() versus read() races: nvram_init() is very simple and race-free, it registers the device then puts it into /proc - there's no state init to race with. Cc: Wim Van Sebroeck <wim@iguana.be> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> LKML-Reference: <1255116426-7270-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--drivers/char/nvram.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 2100a8f7bd86..7cf4518c030f 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -329,14 +329,12 @@ static int nvram_ioctl(struct inode *inode, struct file *file,
329 329
330static int nvram_open(struct inode *inode, struct file *file) 330static int nvram_open(struct inode *inode, struct file *file)
331{ 331{
332 lock_kernel();
333 spin_lock(&nvram_state_lock); 332 spin_lock(&nvram_state_lock);
334 333
335 if ((nvram_open_cnt && (file->f_flags & O_EXCL)) || 334 if ((nvram_open_cnt && (file->f_flags & O_EXCL)) ||
336 (nvram_open_mode & NVRAM_EXCL) || 335 (nvram_open_mode & NVRAM_EXCL) ||
337 ((file->f_mode & FMODE_WRITE) && (nvram_open_mode & NVRAM_WRITE))) { 336 ((file->f_mode & FMODE_WRITE) && (nvram_open_mode & NVRAM_WRITE))) {
338 spin_unlock(&nvram_state_lock); 337 spin_unlock(&nvram_state_lock);
339 unlock_kernel();
340 return -EBUSY; 338 return -EBUSY;
341 } 339 }
342 340
@@ -347,7 +345,6 @@ static int nvram_open(struct inode *inode, struct file *file)
347 nvram_open_cnt++; 345 nvram_open_cnt++;
348 346
349 spin_unlock(&nvram_state_lock); 347 spin_unlock(&nvram_state_lock);
350 unlock_kernel();
351 348
352 return 0; 349 return 0;
353} 350}