Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux
* 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux:
resource: add helpers for fetching rlimits
resource: move kernel function inside __KERNEL__
SECURITY: selinux, fix update_rlimit_cpu parameter
+29
-3
+6
-2
include/linux/resource.h
+6
-2
include/linux/resource.h
···
3
3
4
4
#include <linux/time.h>
5
5
6
-
struct task_struct;
7
-
8
6
/*
9
7
* Resource control/accounting header file for linux
10
8
*/
···
68
70
*/
69
71
#include <asm/resource.h>
70
72
73
+
#ifdef __KERNEL__
74
+
75
+
struct task_struct;
76
+
71
77
int getrusage(struct task_struct *p, int who, struct rusage __user *ru);
78
+
79
+
#endif /* __KERNEL__ */
72
80
73
81
#endif
+22
include/linux/sched.h
+22
include/linux/sched.h
···
2601
2601
}
2602
2602
#endif /* CONFIG_MM_OWNER */
2603
2603
2604
+
static inline unsigned long task_rlimit(const struct task_struct *tsk,
2605
+
unsigned int limit)
2606
+
{
2607
+
return ACCESS_ONCE(tsk->signal->rlim[limit].rlim_cur);
2608
+
}
2609
+
2610
+
static inline unsigned long task_rlimit_max(const struct task_struct *tsk,
2611
+
unsigned int limit)
2612
+
{
2613
+
return ACCESS_ONCE(tsk->signal->rlim[limit].rlim_max);
2614
+
}
2615
+
2616
+
static inline unsigned long rlimit(unsigned int limit)
2617
+
{
2618
+
return task_rlimit(current, limit);
2619
+
}
2620
+
2621
+
static inline unsigned long rlimit_max(unsigned int limit)
2622
+
{
2623
+
return task_rlimit_max(current, limit);
2624
+
}
2625
+
2604
2626
#endif /* __KERNEL__ */
2605
2627
2606
2628
#endif
+1
-1
security/selinux/hooks.c
+1
-1
security/selinux/hooks.c