Skip to content

Commit

Permalink
net: Remove BKL from tun
Browse files Browse the repository at this point in the history
The lock_kernel/unlock_kernel() in cycle_kernel_lock() which is called
in tun_chr_open() is not serializing against anything and safe to
remove.

tun_chr_fasync() is serialized by get/put_tun() and fasync_helper()
has no dependency on BKL. The modification of tun->flags is racy with
and without the BKL so removing it does not make it worse.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Thomas Gleixner authored and David S. Miller committed Oct 14, 2009
1 parent 421355d commit deed49f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/net/tun.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include <linux/kernel.h>
#include <linux/major.h>
#include <linux/slab.h>
#include <linux/smp_lock.h>
#include <linux/poll.h>
#include <linux/fcntl.h>
#include <linux/init.h>
Expand Down Expand Up @@ -1285,7 +1284,6 @@ static int tun_chr_fasync(int fd, struct file *file, int on)

DBG(KERN_INFO "%s: tun_chr_fasync %d\n", tun->dev->name, on);

lock_kernel();
if ((ret = fasync_helper(fd, file, on, &tun->fasync)) < 0)
goto out;

Expand All @@ -1298,15 +1296,14 @@ static int tun_chr_fasync(int fd, struct file *file, int on)
tun->flags &= ~TUN_FASYNC;
ret = 0;
out:
unlock_kernel();
tun_put(tun);
return ret;
}

static int tun_chr_open(struct inode *inode, struct file * file)
{
struct tun_file *tfile;
cycle_kernel_lock();

DBG1(KERN_INFO "tunX: tun_chr_open\n");

tfile = kmalloc(sizeof(*tfile), GFP_KERNEL);
Expand Down

0 comments on commit deed49f

Please sign in to comment.