|
@@ -452,7 +452,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
|
|
|
|
|
|
--tun->numqueues;
|
|
|
if (clean) {
|
|
|
- rcu_assign_pointer(tfile->tun, NULL);
|
|
|
+ RCU_INIT_POINTER(tfile->tun, NULL);
|
|
|
sock_put(&tfile->sk);
|
|
|
} else
|
|
|
tun_disable_queue(tun, tfile);
|
|
@@ -499,12 +499,12 @@ static void tun_detach_all(struct net_device *dev)
|
|
|
tfile = rtnl_dereference(tun->tfiles[i]);
|
|
|
BUG_ON(!tfile);
|
|
|
wake_up_all(&tfile->wq.wait);
|
|
|
- rcu_assign_pointer(tfile->tun, NULL);
|
|
|
+ RCU_INIT_POINTER(tfile->tun, NULL);
|
|
|
--tun->numqueues;
|
|
|
}
|
|
|
list_for_each_entry(tfile, &tun->disabled, next) {
|
|
|
wake_up_all(&tfile->wq.wait);
|
|
|
- rcu_assign_pointer(tfile->tun, NULL);
|
|
|
+ RCU_INIT_POINTER(tfile->tun, NULL);
|
|
|
}
|
|
|
BUG_ON(tun->numqueues != 0);
|
|
|
|
|
@@ -2194,7 +2194,7 @@ static int tun_chr_open(struct inode *inode, struct file * file)
|
|
|
&tun_proto);
|
|
|
if (!tfile)
|
|
|
return -ENOMEM;
|
|
|
- rcu_assign_pointer(tfile->tun, NULL);
|
|
|
+ RCU_INIT_POINTER(tfile->tun, NULL);
|
|
|
tfile->net = get_net(current->nsproxy->net_ns);
|
|
|
tfile->flags = 0;
|
|
|
tfile->ifindex = 0;
|