[PATCH] x86_64: Fix some comments in tlbflush.h

[linux-2.6-omap-h63xx.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 6b7c3b51a7c12ab6ecc160cc08cda83dbb2a9a9c..6f2a178819726b7b878aa22a6d79954b61c1e239 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -383,9 +383,8 @@ int sock_map_fd(struct socket *sock)
                        goto out;
                }
 
-               sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino);
+               this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino);
                this.name = name;
-               this.len = strlen(name);
                this.hash = SOCK_INODE(sock)->i_ino;
 
                file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this);
@@ -1908,7 +1907,7 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
        if (copy_from_user(a, args, nargs[call]))
                return -EFAULT;
 
-       err = audit_socketcall(nargs[call]/sizeof(unsigned long), args);
+       err = audit_socketcall(nargs[call]/sizeof(unsigned long), a);
        if (err)
                return err;