[net-next:master 79/82] net/core/sock.c:1267:3: error: too many arguments to function 'sock_update_classid'

Hi Daniel,

FYI, kernel build failed on

tree:   git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git master
head:   e269ed26d4c9e6da1614709c1bf4c50ff8c8c5b3
commit: fd9a08a7b83074e34c13c6340f673f7a51f53489 [79/82] cgroup: net_cls: Pass in task to sock_update_classid()
config: x86_64-lkp (attached as .config)

All error/warnings:

net/core/sock.c: In function 'sk_alloc':
net/core/sock.c:1267:3: error: too many arguments to function 'sock_update_classid'
In file included from net/core/sock.c:131:0:
include/net/cls_cgroup.h:64:91: note: declared here

vim +1267 net/core/sock.c

154adbc8 Pavel Emelyanov   2007-11-01  1261  		 */
154adbc8 Pavel Emelyanov   2007-11-01  1262  		sk->sk_prot = sk->sk_prot_creator = prot;
154adbc8 Pavel Emelyanov   2007-11-01  1263  		sock_lock_init(sk);
3b1e0a65 YOSHIFUJI Hideaki 2008-03-26  1264  		sock_net_set(sk, get_net(net));
d66ee058 Jarek Poplawski   2009-08-30  1265  		atomic_set(&sk->sk_wmem_alloc, 1);
f8451725 Herbert Xu        2010-05-24  1266  
fd9a08a7 Daniel Wagner     2012-10-25 @1267  		sock_update_classid(sk, current);
406a3c63 John Fastabend    2012-07-20  1268  		sock_update_netprioidx(sk, current);
^1da177e Linus Torvalds    2005-04-16  1269  	}
a79af59e Frank Filz        2005-09-27  1270  

---
0-DAY kernel build testing backend         Open Source Technology Center
Fengguang Wu, Yuanhan Liu                              Intel Corporation

Fixed thusly:

[PATCH] net: Update args to dummy sock_update_classid().

Only the real implementation got updated.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/net/cls_cgroup.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h
index 571de6e..2581638 100644
--- a/include/net/cls_cgroup.h
+++ b/include/net/cls_cgroup.h

@@ -61,7 +61,7 @@ static inline u32 task_cls_classid(struct task_struct *p)
 }
 #endif
 #else /* !CGROUP_NET_CLS_CGROUP */
-static inline void sock_update_classid(struct sock *sk)
+static inline void sock_update_classid(struct sock *sk, struct task_struct *task)
 {
 }
 

-- 
1.7.11.7

On 26.10.2012 11:07, David Miller wrote:

Fixed thusly:

[PATCH] net: Update args to dummy sock_update_classid().

Only the real implementation got updated.

Signed-off-by: David S. Miller <davem@davemloft.net>

Argh, sorry about that one. Thanks for fixing it.

thanks,
Daniel