]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
docs: cgroup-v1: Update charge-commit section
authorT.J. Mercier <tjmercier@google.com>
Thu, 30 Apr 2026 20:11:42 +0000 (13:11 -0700)
committerTejun Heo <tj@kernel.org>
Mon, 4 May 2026 21:02:12 +0000 (11:02 -1000)
Commit 1d8f136a421f ("memcg/hugetlb: remove memcg hugetlb
try-commit-cancel protocol") removed mem_cgroup_commit_charge() and
mem_cgroup_cancel_charge(), but the docs still refer to those functions.
There is no longer any charge cancellation.

Update the docs to match the code.

Signed-off-by: T.J. Mercier <tjmercier@google.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Documentation/admin-guide/cgroup-v1/memcg_test.rst

index 9f8e27355cba54373bf5196f2a67663df07a6a1e..7c7cd457cf695260cb0cecfd996ebba6bdbdec60 100644 (file)
@@ -47,21 +47,19 @@ Please note that implementation details can be changed.
          Called when swp_entry's refcnt goes down to 0. A charge against swap
          disappears.
 
-3. charge-commit-cancel
+3. charge-commit
 =======================
 
        Memcg pages are charged in two steps:
 
                - mem_cgroup_try_charge()
-               - mem_cgroup_commit_charge() or mem_cgroup_cancel_charge()
+               - commit_charge()
 
        At try_charge(), there are no flags to say "this page is charged".
        at this point, usage += PAGE_SIZE.
 
        At commit(), the page is associated with the memcg.
 
-       At cancel(), simply usage -= PAGE_SIZE.
-
 Under below explanation, we assume CONFIG_SWAP=y.
 
 4. Anonymous