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

axboe · axboe · commit b40b69ea6599 · 2025-11-08T06:38:06.000-07:00
* for-6.19/block:
  nbd: defer config put in recv_work
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
@@ -1024,9 +1024,9 @@ static void recv_work(struct work_struct *work)
 	nbd_mark_nsock_dead(nbd, nsock, 1);
 	mutex_unlock(&nsock->tx_lock);
 
-	nbd_config_put(nbd);
 	atomic_dec(&config->recv_threads);
 	wake_up(&config->recv_wq);
+	nbd_config_put(nbd);
 	kfree(args);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1024,9 +1024,9 @@ static void recv_work(struct work_struct *work)`
`1024`	`1024`	`nbd_mark_nsock_dead(nbd, nsock, 1);`
`1025`	`1025`	`mutex_unlock(&nsock->tx_lock);`
`1026`	`1026`
`1027`		`- nbd_config_put(nbd);`
`1028`	`1027`	`atomic_dec(&config->recv_threads);`
`1029`	`1028`	`wake_up(&config->recv_wq);`
	`1029`	`+ nbd_config_put(nbd);`
`1030`	`1030`	`kfree(args);`
`1031`	`1031`	`}`
`1032`	`1032`