You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc-2.6
* 'sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc-2.6: SYSCTL: Add a mutex to the page_alloc zone order sysctl SYSCTL: Print binary sysctl warnings (nearly) only once
This commit is contained in:
+7
-4
@@ -2402,13 +2402,14 @@ int numa_zonelist_order_handler(ctl_table *table, int write,
|
||||
{
|
||||
char saved_string[NUMA_ZONELIST_ORDER_LEN];
|
||||
int ret;
|
||||
static DEFINE_MUTEX(zl_order_mutex);
|
||||
|
||||
mutex_lock(&zl_order_mutex);
|
||||
if (write)
|
||||
strncpy(saved_string, (char*)table->data,
|
||||
NUMA_ZONELIST_ORDER_LEN);
|
||||
strcpy(saved_string, (char*)table->data);
|
||||
ret = proc_dostring(table, write, buffer, length, ppos);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto out;
|
||||
if (write) {
|
||||
int oldval = user_zonelist_order;
|
||||
if (__parse_numa_zonelist_order((char*)table->data)) {
|
||||
@@ -2421,7 +2422,9 @@ int numa_zonelist_order_handler(ctl_table *table, int write,
|
||||
} else if (oldval != user_zonelist_order)
|
||||
build_all_zonelists();
|
||||
}
|
||||
return 0;
|
||||
out:
|
||||
mutex_unlock(&zl_order_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user