- netlink-dont-reinitialize-callback-mutex.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     netlink: don't reinitialize callback mutex
has been removed from the -mm tree.  Its filename was
     netlink-dont-reinitialize-callback-mutex.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: netlink: don't reinitialize callback mutex
From: Patrick McHardy <kaber@xxxxxxxxx>

Don't reinitialize the callback mutex the netlink_kernel_create caller
handed in, it is supposed to already be initialized and could already be
held by someone.

Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 net/netlink/af_netlink.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff -puN net/netlink/af_netlink.c~netlink-dont-reinitialize-callback-mutex net/netlink/af_netlink.c
--- a/net/netlink/af_netlink.c~netlink-dont-reinitialize-callback-mutex
+++ a/net/netlink/af_netlink.c
@@ -388,8 +388,12 @@ static int __netlink_create(struct socke
 	sock_init_data(sock, sk);
 
 	nlk = nlk_sk(sk);
-	nlk->cb_mutex = cb_mutex ? : &nlk->cb_def_mutex;
-	mutex_init(nlk->cb_mutex);
+	if (cb_mutex)
+		nlk->cb_mutex = cb_mutex;
+	else {
+		nlk->cb_mutex = &nlk->cb_def_mutex;
+		mutex_init(nlk->cb_mutex);
+	}
 	init_waitqueue_head(&nlk->wait);
 
 	sk->sk_destruct = netlink_sock_destruct;
_

Patches currently in -mm which might be from kaber@xxxxxxxxx are

networking-fix-sending-netlink-message-when-replace-route.patch
git-net.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux