mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "Three patches" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: include/linux/mmdebug.h: should include linux/bug.h mm/zswap: change incorrect strncmp use to strcmp proc: fix -ESRCH error when writing to /proc/$pid/coredump_filter
This commit is contained in:
commit
8b4414f51d
3 changed files with 5 additions and 3 deletions
|
@ -2494,6 +2494,7 @@ static ssize_t proc_coredump_filter_write(struct file *file,
|
|||
mm = get_task_mm(task);
|
||||
if (!mm)
|
||||
goto out_no_mm;
|
||||
ret = 0;
|
||||
|
||||
for (i = 0, mask = 1; i < MMF_DUMP_FILTER_BITS; i++, mask <<= 1) {
|
||||
if (val & mask)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#ifndef LINUX_MM_DEBUG_H
|
||||
#define LINUX_MM_DEBUG_H 1
|
||||
|
||||
#include <linux/bug.h>
|
||||
#include <linux/stringify.h>
|
||||
|
||||
struct page;
|
||||
|
|
|
@ -541,6 +541,7 @@ static struct zswap_pool *zswap_pool_last_get(void)
|
|||
return last;
|
||||
}
|
||||
|
||||
/* type and compressor must be null-terminated */
|
||||
static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor)
|
||||
{
|
||||
struct zswap_pool *pool;
|
||||
|
@ -548,10 +549,9 @@ static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor)
|
|||
assert_spin_locked(&zswap_pools_lock);
|
||||
|
||||
list_for_each_entry_rcu(pool, &zswap_pools, list) {
|
||||
if (strncmp(pool->tfm_name, compressor, sizeof(pool->tfm_name)))
|
||||
if (strcmp(pool->tfm_name, compressor))
|
||||
continue;
|
||||
if (strncmp(zpool_get_type(pool->zpool), type,
|
||||
sizeof(zswap_zpool_type)))
|
||||
if (strcmp(zpool_get_type(pool->zpool), type))
|
||||
continue;
|
||||
/* if we can't get it, it's about to be destroyed */
|
||||
if (!zswap_pool_get(pool))
|
||||
|
|
Loading…
Reference in a new issue