The quilt patch titled
Subject: mm-shrinkers-add-scan-interface-for-shrinker-debugfs-fix
has been removed from the -mm tree. Its filename was
mm-shrinkers-add-scan-interface-for-shrinker-debugfs-fix.patch
This patch was dropped because it was folded into mm-shrinkers-add-scan-interface-for-shrinker-debugfs.patch
------------------------------------------------------
From: Roman Gushchin <roman.gushchin@xxxxxxxxx>
Subject: mm-shrinkers-add-scan-interface-for-shrinker-debugfs-fix
Date: Wed, 1 Jun 2022 17:56:22 -0700
improve typing, fix arg count checking
Link: https://lkml.kernel.org/r/YpgKttTowT22mKPQ@carbon
Signed-off-by: Roman Gushchin <roman.gushchin@xxxxxxxxx>
Acked-by: Muchun Song <songmuchun@xxxxxxxxxxxxx>
Cc: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Cc: Dave Chinner <dchinner@xxxxxxxxxx>
Cc: Hillf Danton <hdanton@xxxxxxxx>
Cc: Kent Overstreet <kent.overstreet@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/shrinker_debug.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/mm/shrinker_debug.c~mm-shrinkers-add-scan-interface-for-shrinker-debugfs-fix
+++ a/mm/shrinker_debug.c
@@ -110,21 +110,21 @@ static ssize_t shrinker_debugfs_scan_wri
size_t size, loff_t *pos)
{
struct shrinker *shrinker = file->private_data;
- unsigned long nr_to_scan = 0, ino;
+ unsigned long nr_to_scan = 0, ino, read_len;
struct shrink_control sc = {
.gfp_mask = GFP_KERNEL,
};
struct mem_cgroup *memcg = NULL;
int nid;
char kbuf[72];
- int read_len = size < (sizeof(kbuf) - 1) ? size : (sizeof(kbuf) - 1);
ssize_t ret;
+ read_len = size < (sizeof(kbuf) - 1) ? size : (sizeof(kbuf) - 1);
if (copy_from_user(kbuf, buf, read_len))
return -EFAULT;
kbuf[read_len] = '\0';
- if (sscanf(kbuf, "%lu %d %lu", &ino, &nid, &nr_to_scan) < 2)
+ if (sscanf(kbuf, "%lu %d %lu", &ino, &nid, &nr_to_scan) != 2)
return -EINVAL;
if (nid < 0 || nid >= nr_node_ids)
_
Patches currently in -mm which might be from roman.gushchin@xxxxxxxxx are
mm-memcontrol-introduce-mem_cgroup_ino-and-mem_cgroup_get_from_ino.patch
mm-shrinkers-introduce-debugfs-interface-for-memory-shrinkers.patch
mm-shrinkers-provide-shrinkers-with-names.patch
mm-docs-document-shrinker-debugfs.patch
tools-add-memcg_shrinkerpy.patch
mm-shrinkers-add-scan-interface-for-shrinker-debugfs.patch
mm-memcontrol-do-not-miss-memcg_max-events-for-enforced-allocations.patch
