mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 11:49:32 +00:00
8c2152286a
I broke the build with the addition of netprio_cgroups if CONFIG_CGROUPS=n. This patch corrects it by moving the offending struct into an ifdef CONFIG_CGROUPS block. Also clean up a few needless defines and inline functions that don't get called if CONFIG_CGROUPS isn't defined while Im at it. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
57 lines
1.2 KiB
C
57 lines
1.2 KiB
C
/*
|
|
* netprio_cgroup.h Control Group Priority set
|
|
*
|
|
*
|
|
* Authors: Neil Horman <nhorman@tuxdriver.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the Free
|
|
* Software Foundation; either version 2 of the License, or (at your option)
|
|
* any later version.
|
|
*
|
|
*/
|
|
|
|
#ifndef _NETPRIO_CGROUP_H
|
|
#define _NETPRIO_CGROUP_H
|
|
#include <linux/module.h>
|
|
#include <linux/cgroup.h>
|
|
#include <linux/hardirq.h>
|
|
#include <linux/rcupdate.h>
|
|
|
|
|
|
struct netprio_map {
|
|
struct rcu_head rcu;
|
|
u32 priomap_len;
|
|
u32 priomap[];
|
|
};
|
|
|
|
#ifdef CONFIG_CGROUPS
|
|
|
|
struct cgroup_netprio_state {
|
|
struct cgroup_subsys_state css;
|
|
u32 prioidx;
|
|
};
|
|
|
|
#ifndef CONFIG_NETPRIO_CGROUP
|
|
extern int net_prio_subsys_id;
|
|
#endif
|
|
|
|
extern void sock_update_netprioidx(struct sock *sk);
|
|
|
|
static inline struct cgroup_netprio_state
|
|
*task_netprio_state(struct task_struct *p)
|
|
{
|
|
#if IS_ENABLED(CONFIG_NETPRIO_CGROUP)
|
|
return container_of(task_subsys_state(p, net_prio_subsys_id),
|
|
struct cgroup_netprio_state, css);
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
#else
|
|
|
|
#define sock_update_netprioidx(sk)
|
|
#endif
|
|
|
|
#endif /* _NET_CLS_CGROUP_H */
|