diff options
author | Jonathan Corbet <corbet@lwn.net> | 2008-05-18 17:40:00 -0400 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2008-06-20 16:05:53 -0400 |
commit | 9514dff918b947ae43b66517dc90d0e05548bd6a (patch) | |
tree | 3aa6a3ece62d2304f472e9d4aba5ce339f904492 /fs/char_dev.c | |
parent | a30427d92d0bc152b833088e4a305bbeb1a0c162 (diff) |
Remove the lock_kernel() call from chrdev_open()
All in-kernel char device open() functions now either have their own
lock_kernel() calls or clearly do not need one.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'fs/char_dev.c')
-rw-r--r-- | fs/char_dev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index a54d69369b2f..3cb7cda3d780 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c | |||
@@ -394,11 +394,8 @@ static int chrdev_open(struct inode *inode, struct file *filp) | |||
394 | cdev_put(p); | 394 | cdev_put(p); |
395 | return -ENXIO; | 395 | return -ENXIO; |
396 | } | 396 | } |
397 | if (filp->f_op->open) { | 397 | if (filp->f_op->open) |
398 | lock_kernel(); | ||
399 | ret = filp->f_op->open(inode,filp); | 398 | ret = filp->f_op->open(inode,filp); |
400 | unlock_kernel(); | ||
401 | } | ||
402 | if (ret) | 399 | if (ret) |
403 | cdev_put(p); | 400 | cdev_put(p); |
404 | return ret; | 401 | return ret; |