X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=net%2Funix%2Faf_unix.c;h=9dcc6e7f96ec2126039ce6b57768b7274bf5f19e;hb=8fe74cf053de7ad2124a894996f84fa890a81093;hp=d1b89820ab4f34bc5ad8d00d7fa221691f7876c5;hpb=a56cdcb662032a732f7c4f35cc5a9acf37759d8c;p=linux-2.6-omap-h63xx.git

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index d1b89820ab4..9dcc6e7f96e 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -832,7 +832,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 		 * All right, let's create it.
 		 */
 		mode = S_IFSOCK |
-		       (SOCK_INODE(sock)->i_mode & ~current->fs->umask);
+		       (SOCK_INODE(sock)->i_mode & ~current_umask());
 		err = mnt_want_write(nd.path.mnt);
 		if (err)
 			goto out_mknod_dput;
@@ -1178,8 +1178,7 @@ out_unlock:
 		unix_state_unlock(other);
 
 out:
-	if (skb)
-		kfree_skb(skb);
+	kfree_skb(skb);
 	if (newsk)
 		unix_release_sock(newsk, 0);
 	if (other)