git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index
02dc82d
..
b1cbbcd
100644
(file)
--- a/
net/socket.c
+++ b/
net/socket.c
@@
-467,7
+467,7
@@
static struct socket *sock_alloc(void)
struct inode *inode;
struct socket *sock;
struct inode *inode;
struct socket *sock;
- inode = new_inode(sock_mnt->mnt_sb);
+ inode = new_inode
_pseudo
(sock_mnt->mnt_sb);
if (!inode)
return NULL;
if (!inode)
return NULL;
@@
-580,7
+580,7
@@
int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
}
EXPORT_SYMBOL(sock_sendmsg);
}
EXPORT_SYMBOL(sock_sendmsg);
-int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg, size_t size)
+
static
int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg, size_t size)
{
struct kiocb iocb;
struct sock_iocb siocb;
{
struct kiocb iocb;
struct sock_iocb siocb;