diff for duplicates of <20200626033016.7z3uIdJCS%akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index 06a4b4a..37908f9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,3 +61,12 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> */ if (!(cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_RECURSIVE_PROT)) return ep; +- +- if (parent_effective > siblings_protected && usage > protected) { ++ if (parent_effective > siblings_protected && ++ parent_usage > siblings_protected && ++ usage > protected) { + unsigned long unclaimed; + + unclaimed = parent_effective - siblings_protected; +_ diff --git a/a/content_digest b/N1/content_digest index e2b252b..7674449 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -75,6 +75,15 @@ "+\t * aren't read atomically - make sure the division is sane.\n" " \t */\n" " \tif (!(cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_RECURSIVE_PROT))\n" - " \t\treturn ep;" + " \t\treturn ep;\n" + "-\n" + "-\tif (parent_effective > siblings_protected && usage > protected) {\n" + "+\tif (parent_effective > siblings_protected &&\n" + "+\t parent_usage > siblings_protected &&\n" + "+\t usage > protected) {\n" + " \t\tunsigned long unclaimed;\n" + " \n" + " \t\tunclaimed = parent_effective - siblings_protected;\n" + _ -569f3db6617c76a5b00ff0379e15ccd2c8d8a26da46d147f63dd1a3be1a1fb7c +61a56eee56287bc22dea98620a5f7f618ffe227b5447b62b229a2e7c62da91ee
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.