Li Zefan
f9ab5b5b0f
cgroups: forbid noprefix if mounting more than just cpuset subsystem ...
The 'noprefix' option was introduced for backwards-compatibility of
cpuset, but actually it can be used when mounting other subsystems.
This results in possibility of name collision, and now the collision can
really happen, because we have 'stat' file in both memory and cpuacct
subsystem:
# mount -t cgroup -o noprefix,memory,cpuacct xxx /mnt
Cgroup will happily mount the 2 subsystems, but only 'stat' file of memory
subsys can be seen.
We don't want users to use nopreifx, and also want to avoid name
collision, so we change to allow noprefix only if mounting just the cpuset
subsystem.
[akpm@linux-foundation.org: fix shift for cpuset_subsys_id >= 32]
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Paul Menage <menage@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-06-18 13:03:46 -07:00
irq: slab alloc for default irq_affinity
2009-06-12 13:50:23 +03:00
mm, PM/Freezer: Disable OOM killer when tasks are frozen
2009-06-16 19:47:40 -07:00
Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-06-15 10:06:19 -07:00
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck
2009-06-16 13:09:51 -07:00
[CVE-2009-0029] System call wrappers part 04
2009-01-14 14:15:19 +01:00
async: Fix lack of boot-time console due to insufficient synchronization
2009-06-08 12:31:53 -07:00
Audit: remove spaces from audit_log_d_path
2009-04-05 13:49:04 -04:00
fixing audit rule ordering mess, part 1
2009-01-04 15:14:41 -05:00
Switch collect_mounts() to struct path
2009-06-11 21:36:01 -04:00
inotify: use GFP_NOFS in kernel_event() to work around a lockdep false-positive
2009-05-06 16:36:09 -07:00
Audit: remove spaces from audit_log_d_path
2009-04-05 13:49:04 -04:00
[CVE-2009-0029] System call wrappers part 04
2009-01-14 14:15:19 +01:00
cgroups: forbid noprefix if mounting more than just cpuset subsystem
2009-06-18 13:03:46 -07:00
debug cgroup: remove unneeded cgroup_lock
2009-04-02 19:04:54 -07:00
freezer_cg: disable writing freezer.state of root cgroup
2008-11-12 17:17:16 -08:00
signals: implement sys_rt_tgsigqueueinfo
2009-04-30 19:24:24 +02:00
cpumask: use set_cpu_active in init/main.c
2009-03-30 22:05:12 +10:30
cpuset,mm: update tasks' mems_allowed in time
2009-06-16 19:47:31 -07:00
CRED: Inaugurate COW credentials
2008-11-14 10:39:23 +11:00
CRED: Rename cred_exec_mutex to reflect that it's a guard against ptrace
2009-05-11 08:15:36 +10:00
schedstat: consolidate per-task cpu runtime stats
2008-12-18 13:54:01 +01:00
dma-coherent: Restore dma_alloc_from_coherent() large alloc fall back policy.
2009-01-21 18:51:53 +09:00
Get rid of indirect include of fs_struct.h
2009-03-31 23:00:27 -04:00
Merge branch 'perfcounters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-06-11 14:01:07 -07:00
Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-04-05 11:04:19 -07:00
kmemcheck: add mm functions
2009-06-15 12:40:03 +02:00
freezer_cg: use thaw_process() in unfreeze_cgroup()
2008-10-30 11:38:45 -07:00
futex: fix restart in wait_requeue_pi
2009-05-20 10:34:32 +02:00
CRED: Use RCU to access another task's creds and to release a task's own creds
2008-11-14 10:39:19 +11:00
groups: move code to kernel/groups.c
2009-06-16 19:47:48 -07:00
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
2009-06-17 09:46:33 -07:00
softlockup: ensure the task has been switched out once
2009-02-11 11:04:16 +01:00
timers: split process wide cpu clocks/timers
2009-02-05 13:04:33 +01:00
kernel/kallsyms.c: replace deprecated __initcall with device_initcall and fix whitespace
2009-06-09 22:37:52 +02:00
rcu: provide RCU options on non-preempt architectures too
2008-12-25 09:31:28 +01:00
PM core: rename suspend and resume functions
2009-06-12 21:32:31 +02:00
kernel/kfifo.c: replace conditional test with is_power_of_2()
2009-06-16 19:47:47 -07:00
sysrq, intel_fb: fix sysrq g collision
2009-05-15 07:56:24 -05:00
kmod: Release sub_info on cred allocation failure.
2009-05-26 12:11:19 -07:00
kprobes: fix to use text_mutex around arm/disarm kprobe
2009-05-08 16:23:48 -07:00
kernel/ksysfs.c:fix dependence on CONFIG_NET
2009-01-06 10:44:31 -08:00
cpuset,mm: update tasks' mems_allowed in time
2009-06-16 19:47:31 -07:00
sched, latencytop: incorporate review feedback from Andrew Morton
2009-02-11 10:18:04 +01:00
Merge branch 'linus' into tracing/core
2009-05-07 11:17:34 +02:00
lockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS
2009-05-12 19:59:52 +02:00
lockstat: warn about disabled lock debugging
2009-02-14 23:28:28 +01:00
lockdep: move state bit definitions around
2009-02-14 23:27:59 +01:00
groups: move code to kernel/groups.c
2009-06-16 19:47:48 -07:00
markers/tracpoints: fix non-modular build
2008-11-16 09:52:03 +01:00
printk: add KERN_DEFAULT loglevel to print_modules()
2009-06-16 11:07:14 -07:00
mutex: implement adaptive spinning
2009-01-14 18:09:02 +01:00
mutex: implement adaptive spinning
2009-01-14 18:09:02 +01:00
Merge branch 'linus' into perfcounters/core
2009-06-11 17:55:42 +02:00
mutex: implement adaptive spinning
2009-01-14 18:09:02 +01:00
Merge commit 'v2.6.28-rc6' into core/debug
2008-11-26 08:22:50 +01:00
cgroups: relax ns_can_attach checks to allow attaching to grandchild cgroups
2009-04-02 19:04:53 -07:00
User namespaces: set of cleanups (v2)
2008-11-24 18:57:41 -05:00
Fix caller information for warn_slowpath_null
2009-05-16 13:41:28 -07:00
module_param: allow 'bool' module_params to be bool, not just int.
2009-06-12 21:46:58 +09:30
perf_counter: Add forward/backward attribute ABI compatibility
2009-06-12 14:28:52 +02:00
pids: refactor vnr/nr_ns helpers to make them safe
2009-04-02 19:05:02 -07:00
signals: zap_pid_ns_process() should use force_sig()
2009-04-02 19:04:58 -07:00
kernel/posix-cpu-timers.c: fix sparse warning
2009-04-30 08:08:31 +02:00
[CVE-2009-0029] System call wrappers part 05
2009-01-14 14:15:20 +01:00
printk: Add KERN_DEFAULT printk log-level
2009-06-16 11:02:28 -07:00
page allocator: do not check NUMA node ID when the caller knows the node is valid
2009-06-16 19:47:32 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
2009-06-11 10:01:41 -07:00
kmemtrace, rcu: fix linux/rcutree.h and linux/rcuclassic.h dependencies
2009-04-03 12:23:02 +02:00
RCU: Don't try and predeclare inline funcs as it upsets some versions of gcc
2009-04-15 13:55:14 -07:00
rcu: rcu_sched_grace_period(): kill the bogus flush_signals()
2009-05-05 20:28:05 +02:00
"Tree RCU": scalable classic RCU implementation
2008-12-18 21:56:04 +01:00
cpumask: convert rcutorture.c
2009-03-30 22:05:16 +10:30
rcu: Add __rcu_pending tracing to hierarchical RCU
2009-04-14 11:33:43 +02:00
kmemtrace, rcu: fix rcu_tree_trace.c data structure dependencies
2009-04-03 12:23:03 +02:00
rcu: Add __rcu_pending tracing to hierarchical RCU
2009-04-14 11:33:43 +02:00
Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-04-05 11:04:19 -07:00
memcg: memory cgroup resource counters for hierarchy
2009-01-08 08:31:05 -08:00
Remove 'recurse into child resources' logic from 'reserve_region_with_split()'
2009-04-18 21:44:24 -07:00
trivial: fix ETIMEOUT -> ETIMEDOUT typos
2009-06-12 18:01:50 +02:00
rt_mutex: add proxy lock routines
2009-04-06 11:14:02 +02:00
Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-06-15 10:06:19 -07:00
sched: Fix fallback sched_clock()'s offset when using jiffies
2009-05-09 10:08:19 +02:00
sched: use slab in cpupri_init()
2009-06-11 19:27:12 +03:00
cpumask: remove cpumask_t from core
2009-03-30 22:05:17 +10:30
sched: remove unused fields from struct rq
2009-03-24 23:16:51 +01:00
sched: remove redundant hierarchy walk in check_preempt_wakeup
2009-04-09 08:19:08 +02:00
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-03-30 17:17:35 -07:00
sched, timers: move calc_load() to scheduler
2009-05-15 15:32:45 +02:00
cpumask: alloc zeroed cpumask for static cpumask_var_ts
2009-06-09 22:30:27 +09:30
sched: remove unused fields from struct rq
2009-03-24 23:16:51 +01:00
x86-64: seccomp: fix 32/64 syscall hole
2009-03-02 15:41:30 -08:00
signal: fix __send_signal() false positive kmemcheck warning
2009-06-15 15:49:43 +02:00
slow-work: use round_jiffies() for thread pool's cull and OOM timers
2009-06-16 19:47:49 -07:00
cpumask: alloc zeroed cpumask for static cpumask_var_ts
2009-06-09 22:30:27 +09:30
softirq: introduce statistics for softirq
2009-06-18 13:03:40 -07:00
softlockup: decouple hung tasks check from softlockup detection
2009-01-16 14:06:04 +01:00
Allow rwlocks to re-enable interrupts
2009-04-02 19:05:11 -07:00
stacktrace: provide save_stack_trace_tsk() weak alias
2008-12-25 11:44:43 +01:00
cpumask: remove cpumask_t from core
2009-03-30 22:05:17 +10:30
groups: move code to kernel/groups.c
2009-06-16 19:47:48 -07:00
Merge commit 'v2.6.29-rc2' into perfcounters/core
2009-01-21 16:37:27 +01:00
Merge branch 'akpm'
2009-06-16 19:50:13 -07:00
net: add ARP notify option for devices
2009-02-01 01:04:33 -08:00
cpumask: convert rest of files in kernel/
2009-01-01 10:12:28 +10:30
kprobes: add tests for register_kprobes
2009-01-06 15:59:20 -08:00
[CVE-2009-0029] System call wrappers part 01
2009-01-14 14:15:18 +01:00
Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-06-15 10:06:19 -07:00
tracepoints: dont update zero-sized tracepoint sections
2009-03-18 19:55:00 +01:00
Fix fixpoint divide exception in acct_update_integrals
2009-03-09 08:13:35 -07:00
[CVE-2009-0029] System call wrappers part 19
2009-01-14 14:15:26 +01:00
smp_call_function_single(): be slightly less stupid, fix #2
2009-01-12 16:04:37 +01:00
sched: delayed cleanup of user_struct
2009-06-15 21:30:23 -07:00
Fix recursive lock in free_uid()/free_user_ns()
2009-02-27 16:26:21 -08:00
proc_sysctl: use CONFIG_PROC_SYSCTL around ipc and utsname proc_handlers
2009-04-02 19:05:01 -07:00
wait: don't use __wake_up_common()
2009-04-14 17:17:16 +02:00
ftrace, workqueuetrace: make workqueue tracepoints use TRACE_EVENT macro
2009-06-02 01:10:40 +02:00
f9ab5b5b0f