diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /net/socket.c | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index f0565ed3e..015630d2e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -443,6 +443,7 @@ struct socket *sock_alloc(void) if (!inode) return NULL; + inode->i_sb = sock_mnt->mnt_sb; sock = socki_lookup(inode); inode->i_mode = S_IFSOCK|S_IRWXUGO; @@ -1711,6 +1712,9 @@ void __init sock_init(void) proto_init(); + register_filesystem(&sock_fs_type); + sock_mnt = kern_mount(&sock_fs_type); + /* * The netlink device handler may be needed early. */ @@ -1724,8 +1728,6 @@ void __init sock_init(void) #ifdef CONFIG_NETFILTER netfilter_init(); #endif - register_filesystem(&sock_fs_type); - sock_mnt = kern_mount(&sock_fs_type); } int socket_get_info(char *buffer, char **start, off_t offset, int length) |