diff options
| author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
| commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
| tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /net/socket.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index 76ba80aeac1a..072e2e525ae6 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -491,8 +491,8 @@ static struct socket *sock_alloc(void) | |||
| 491 | sock = SOCKET_I(inode); | 491 | sock = SOCKET_I(inode); |
| 492 | 492 | ||
| 493 | inode->i_mode = S_IFSOCK | S_IRWXUGO; | 493 | inode->i_mode = S_IFSOCK | S_IRWXUGO; |
| 494 | inode->i_uid = current->fsuid; | 494 | inode->i_uid = current_fsuid(); |
| 495 | inode->i_gid = current->fsgid; | 495 | inode->i_gid = current_fsgid(); |
| 496 | 496 | ||
| 497 | get_cpu_var(sockets_in_use)++; | 497 | get_cpu_var(sockets_in_use)++; |
| 498 | put_cpu_var(sockets_in_use); | 498 | put_cpu_var(sockets_in_use); |