diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 02:11:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 02:11:50 -0400 |
| commit | 060de20e82195d404f7dc6a914685730376fdc80 (patch) | |
| tree | f7b8499beaae104016b46e7583b2dbc1d6d7f901 /net/socket.c | |
| parent | b7c84c6ada2be942eca6722edb2cfaad412cd5de (diff) | |
| parent | 2c4ee8f907fc4a3c69273a958f853bf4b358eb49 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index 38729af09461..6f2a17881972 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -383,9 +383,8 @@ int sock_map_fd(struct socket *sock) | |||
| 383 | goto out; | 383 | goto out; |
| 384 | } | 384 | } |
| 385 | 385 | ||
| 386 | sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino); | 386 | this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino); |
| 387 | this.name = name; | 387 | this.name = name; |
| 388 | this.len = strlen(name); | ||
| 389 | this.hash = SOCK_INODE(sock)->i_ino; | 388 | this.hash = SOCK_INODE(sock)->i_ino; |
| 390 | 389 | ||
| 391 | file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this); | 390 | file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this); |