Merge branch 'for-7.1/block' into for-next

axboe · axboe · commit 208cd4463fd4 · 2026-03-31T13:56:05.000-06:00
* for-7.1/block:
  blk-cgroup: fix disk reference leak in blkcg_maybe_throttle_current()
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
@@ -2037,6 +2037,7 @@ void blkcg_maybe_throttle_current(void)
 	return;
 out:
 	rcu_read_unlock();
+	put_disk(disk);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -2037,6 +2037,7 @@ void blkcg_maybe_throttle_current(void)`
`2037`	`2037`	`return;`
`2038`	`2038`	`out:`
`2039`	`2039`	`rcu_read_unlock();`
	`2040`	`+ put_disk(disk);`
`2040`	`2041`	`}`
`2041`	`2042`
`2042`	`2043`	`/**`