* [PATCH 1/2] cls_cgroup: remove task_struct parameter from sock_update_classid()
@ 2013-04-09 6:03 Li Zefan
2013-04-09 6:03 ` [PATCH 2/2] netprio_cgroup: remove task_struct parameter from sock_update_netprio() Li Zefan
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Li Zefan @ 2013-04-09 6:03 UTC (permalink / raw)
To: David Miller; +Cc: netdev, LKML, Neil Horman
The callers always pass current to sock_update_classid().
Signed-off-by: Li Zefan <lizefan@huawei.com>
---
include/net/cls_cgroup.h | 4 ++--
net/core/scm.c | 2 +-
net/core/sock.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h
index 2581638..0fee061 100644
--- a/include/net/cls_cgroup.h
+++ b/include/net/cls_cgroup.h
@@ -24,7 +24,7 @@ struct cgroup_cls_state
u32 classid;
};
-extern void sock_update_classid(struct sock *sk, struct task_struct *task);
+extern void sock_update_classid(struct sock *sk);
#if IS_BUILTIN(CONFIG_NET_CLS_CGROUP)
static inline u32 task_cls_classid(struct task_struct *p)
@@ -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, struct task_struct *task)
+static inline void sock_update_classid(struct sock *sk)
{
}
diff --git a/net/core/scm.c b/net/core/scm.c
index 2dc6cda..cb8d98c 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -307,7 +307,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
sock = sock_from_file(fp[i], &err);
if (sock) {
sock_update_netprioidx(sock->sk, current);
- sock_update_classid(sock->sk, current);
+ sock_update_classid(sock->sk);
}
fd_install(new_fd, get_file(fp[i]));
}
diff --git a/net/core/sock.c b/net/core/sock.c
index 2ff5f36..0e1d2fe 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1307,11 +1307,11 @@ static void sk_prot_free(struct proto *prot, struct sock *sk)
}
#if IS_ENABLED(CONFIG_NET_CLS_CGROUP)
-void sock_update_classid(struct sock *sk, struct task_struct *task)
+void sock_update_classid(struct sock *sk)
{
u32 classid;
- classid = task_cls_classid(task);
+ classid = task_cls_classid(current);
if (classid != sk->sk_classid)
sk->sk_classid = classid;
}
@@ -1353,7 +1353,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
sock_net_set(sk, get_net(net));
atomic_set(&sk->sk_wmem_alloc, 1);
- sock_update_classid(sk, current);
+ sock_update_classid(sk);
sock_update_netprioidx(sk, current);
}
--
1.8.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] netprio_cgroup: remove task_struct parameter from sock_update_netprio()
2013-04-09 6:03 [PATCH 1/2] cls_cgroup: remove task_struct parameter from sock_update_classid() Li Zefan
@ 2013-04-09 6:03 ` Li Zefan
2013-04-09 13:39 ` Neil Horman
2013-04-09 17:20 ` David Miller
2013-04-09 13:35 ` [PATCH 1/2] cls_cgroup: remove task_struct parameter from sock_update_classid() Neil Horman
2013-04-09 17:20 ` David Miller
2 siblings, 2 replies; 6+ messages in thread
From: Li Zefan @ 2013-04-09 6:03 UTC (permalink / raw)
To: David Miller; +Cc: netdev, LKML, Neil Horman
The callers always pass current to sock_update_netprio().
Signed-off-by: Li Zefan <lizefan@huawei.com>
---
include/net/netprio_cgroup.h | 4 ++--
net/core/scm.c | 2 +-
net/core/sock.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
index 1d04b6f..50ab8c2 100644
--- a/include/net/netprio_cgroup.h
+++ b/include/net/netprio_cgroup.h
@@ -29,7 +29,7 @@ struct cgroup_netprio_state {
struct cgroup_subsys_state css;
};
-extern void sock_update_netprioidx(struct sock *sk, struct task_struct *task);
+extern void sock_update_netprioidx(struct sock *sk);
#if IS_BUILTIN(CONFIG_NETPRIO_CGROUP)
@@ -68,7 +68,7 @@ static inline u32 task_netprioidx(struct task_struct *p)
return 0;
}
-#define sock_update_netprioidx(sk, task)
+#define sock_update_netprioidx(sk)
#endif /* CONFIG_NETPRIO_CGROUP */
diff --git a/net/core/scm.c b/net/core/scm.c
index cb8d98c..10153e5 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -306,7 +306,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
/* Bump the usage count and install the file. */
sock = sock_from_file(fp[i], &err);
if (sock) {
- sock_update_netprioidx(sock->sk, current);
+ sock_update_netprioidx(sock->sk);
sock_update_classid(sock->sk);
}
fd_install(new_fd, get_file(fp[i]));
diff --git a/net/core/sock.c b/net/core/sock.c
index 0e1d2fe..d4f4cea 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1319,12 +1319,12 @@ EXPORT_SYMBOL(sock_update_classid);
#endif
#if IS_ENABLED(CONFIG_NETPRIO_CGROUP)
-void sock_update_netprioidx(struct sock *sk, struct task_struct *task)
+void sock_update_netprioidx(struct sock *sk)
{
if (in_interrupt())
return;
- sk->sk_cgrp_prioidx = task_netprioidx(task);
+ sk->sk_cgrp_prioidx = task_netprioidx(current);
}
EXPORT_SYMBOL_GPL(sock_update_netprioidx);
#endif
@@ -1354,7 +1354,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
atomic_set(&sk->sk_wmem_alloc, 1);
sock_update_classid(sk);
- sock_update_netprioidx(sk, current);
+ sock_update_netprioidx(sk);
}
return sk;
--
1.8.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] netprio_cgroup: remove task_struct parameter from sock_update_netprio()
2013-04-09 6:03 ` [PATCH 2/2] netprio_cgroup: remove task_struct parameter from sock_update_netprio() Li Zefan
@ 2013-04-09 13:39 ` Neil Horman
2013-04-09 17:20 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: Neil Horman @ 2013-04-09 13:39 UTC (permalink / raw)
To: Li Zefan; +Cc: David Miller, netdev, LKML
On Tue, Apr 09, 2013 at 02:03:47PM +0800, Li Zefan wrote:
> The callers always pass current to sock_update_netprio().
>
> Signed-off-by: Li Zefan <lizefan@huawei.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] netprio_cgroup: remove task_struct parameter from sock_update_netprio()
2013-04-09 6:03 ` [PATCH 2/2] netprio_cgroup: remove task_struct parameter from sock_update_netprio() Li Zefan
2013-04-09 13:39 ` Neil Horman
@ 2013-04-09 17:20 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2013-04-09 17:20 UTC (permalink / raw)
To: lizefan; +Cc: netdev, linux-kernel, nhorman
From: Li Zefan <lizefan@huawei.com>
Date: Tue, 9 Apr 2013 14:03:47 +0800
> The callers always pass current to sock_update_netprio().
>
> Signed-off-by: Li Zefan <lizefan@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] cls_cgroup: remove task_struct parameter from sock_update_classid()
2013-04-09 6:03 [PATCH 1/2] cls_cgroup: remove task_struct parameter from sock_update_classid() Li Zefan
2013-04-09 6:03 ` [PATCH 2/2] netprio_cgroup: remove task_struct parameter from sock_update_netprio() Li Zefan
@ 2013-04-09 13:35 ` Neil Horman
2013-04-09 17:20 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Neil Horman @ 2013-04-09 13:35 UTC (permalink / raw)
To: Li Zefan; +Cc: David Miller, netdev, LKML
On Tue, Apr 09, 2013 at 02:03:35PM +0800, Li Zefan wrote:
> The callers always pass current to sock_update_classid().
>
> Signed-off-by: Li Zefan <lizefan@huawei.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] cls_cgroup: remove task_struct parameter from sock_update_classid()
2013-04-09 6:03 [PATCH 1/2] cls_cgroup: remove task_struct parameter from sock_update_classid() Li Zefan
2013-04-09 6:03 ` [PATCH 2/2] netprio_cgroup: remove task_struct parameter from sock_update_netprio() Li Zefan
2013-04-09 13:35 ` [PATCH 1/2] cls_cgroup: remove task_struct parameter from sock_update_classid() Neil Horman
@ 2013-04-09 17:20 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-04-09 17:20 UTC (permalink / raw)
To: lizefan; +Cc: netdev, linux-kernel, nhorman
From: Li Zefan <lizefan@huawei.com>
Date: Tue, 9 Apr 2013 14:03:35 +0800
> The callers always pass current to sock_update_classid().
>
> Signed-off-by: Li Zefan <lizefan@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-04-09 17:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-09 6:03 [PATCH 1/2] cls_cgroup: remove task_struct parameter from sock_update_classid() Li Zefan
2013-04-09 6:03 ` [PATCH 2/2] netprio_cgroup: remove task_struct parameter from sock_update_netprio() Li Zefan
2013-04-09 13:39 ` Neil Horman
2013-04-09 17:20 ` David Miller
2013-04-09 13:35 ` [PATCH 1/2] cls_cgroup: remove task_struct parameter from sock_update_classid() Neil Horman
2013-04-09 17:20 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).