diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:11:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:11:40 -0800 |
| commit | 87f504e5c78b910b0c1d6ffb89bc95e492322c84 (patch) | |
| tree | 09ce73c1ce5fa5beb1a8c99858ef0bc5428e7f2a /net/socket.c | |
| parent | f7bad91dac8ba67fbffb094f662f7444a0891314 (diff) | |
v2.4.9.1 -> v2.4.9.2
- Al Viro: block device cleanups
- Marcelo Tosatti: make bounce buffer allocations more robust (it's ok
for them to do IO, just not cause recursive bounce IO. So allow them)
- Anton Altaparmakov: NTFS update (1.1.17)
- Paul Mackerras: PPC update (big re-org)
- Petko Manolov: USB pegasus driver fixes
- David Miller: networking and sparc updates
- Trond Myklebust: Export atomic_dec_and_lock
- OGAWA Hirofumi: find and fix umsdos "filldir" users that were broken
by the 64-bit-cleanups. Fix msdos warnings.
- Al Viro: superblock handling cleanups and race fixes
- Johannes Erdfelt++: USB updates
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/socket.c b/net/socket.c index 2afd2478e9f9..e9d6000cc83d 100644 --- a/net/socket.c +++ b/net/socket.c @@ -303,8 +303,7 @@ static struct super_block * sockfs_read_super(struct super_block *sb, void *data } static struct vfsmount *sock_mnt; -static DECLARE_FSTYPE(sock_fs_type, "sockfs", sockfs_read_super, - FS_NOMOUNT|FS_SINGLE); +static DECLARE_FSTYPE(sock_fs_type, "sockfs", sockfs_read_super, FS_NOMOUNT); static int sockfs_delete_dentry(struct dentry *dentry) { return 1; @@ -1205,13 +1204,14 @@ asmlinkage long sys_sendto(int fd, void * buff, size_t len, unsigned flags, msg.msg_iovlen=1; msg.msg_control=NULL; msg.msg_controllen=0; - msg.msg_namelen=addr_len; + msg.msg_namelen=0; if(addr) { err = move_addr_to_kernel(addr, addr_len, address); if (err < 0) goto out_put; msg.msg_name=address; + msg.msg_namelen=addr_len; } if (sock->file->f_flags & O_NONBLOCK) flags |= MSG_DONTWAIT; |