Merge branch 'next' into for-linus
This commit is contained in:
commit
cbacc2c7f0
223 changed files with 5707 additions and 3351 deletions
|
|
@ -491,8 +491,8 @@ static struct socket *sock_alloc(void)
|
|||
sock = SOCKET_I(inode);
|
||||
|
||||
inode->i_mode = S_IFSOCK | S_IRWXUGO;
|
||||
inode->i_uid = current->fsuid;
|
||||
inode->i_gid = current->fsgid;
|
||||
inode->i_uid = current_fsuid();
|
||||
inode->i_gid = current_fsgid();
|
||||
|
||||
get_cpu_var(sockets_in_use)++;
|
||||
put_cpu_var(sockets_in_use);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue