Skip to contentSkip to conversation

docs: cgroup-v1: Update charge-commit section

PATCH Applied T.J. Mercier 2 participants 2 messages Apr 30 – May 4

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 docs: cgroup-v1: Update charge-commit section

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.

---
 Documentation/admin-guide/cgroup-v1/memcg_test.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Documentation/admin-guide/cgroup-v1/memcg_test.rst +2 -4
index 9f8e27355cba..7c7cd457cf69 100644
@@ -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
Signature · 1 line
2.54.0.545.g6539524ca2-goog
maintainer Applied
#1 lore raw

Hello,

Applied to cgroup/for-7.1-fixes.

Thanks.

--
tejun