patch-1.3.82 linux/net/unix/af_unix.c

Next file: linux/net/unix/sysctl_net_unix.c
Previous file: linux/net/unix/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.81/linux/net/unix/af_unix.c linux/net/unix/af_unix.c
@@ -148,7 +148,7 @@
 	{
 		if(sk->protinfo.af_unix.name)
 			kfree(sk->protinfo.af_unix.name);
-		kfree_s(sk,sizeof(*sk));
+		sk_free(sk);
 		return;
 	}
 	
@@ -202,7 +202,7 @@
 	{
 		if(sk->protinfo.af_unix.name)
 			kfree(sk->protinfo.af_unix.name);
-		kfree_s(sk,sizeof(*sk));
+		sk_free(sk);
 	}
 	else
 	{
@@ -281,7 +281,7 @@
 	unix_socket *sk;
 	if(protocol && protocol != PF_UNIX)
 		return -EPROTONOSUPPORT;
-	sk=(unix_socket *)kmalloc(sizeof(*sk),GFP_KERNEL);
+	sk=(unix_socket *)sk_alloc(GFP_KERNEL);
 	if(sk==NULL)
 		return -ENOMEM;
 	switch(sock->type)
@@ -297,7 +297,7 @@
 		case SOCK_DGRAM:
 			break;
 		default:
-			kfree_s(sk,sizeof(*sk));
+			sk_free(sk);
 			return -ESOCKTNOSUPPORT;
 	}
 	sk->type=sock->type;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this