Merge branch 'block-6.19' into for-next

axboe · axboe · commit 2c3ccdb47003 · 2026-01-15T07:22:32.000-07:00
* block-6.19:
  rnbd-clt: fix refcount underflow in device unmap path
diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c
@@ -1664,7 +1664,6 @@ static void rnbd_destroy_sysfs(struct rnbd_clt_dev *dev,
 			/* To avoid deadlock firstly remove itself */
 			sysfs_remove_file_self(&dev->kobj, sysfs_self);
 		kobject_del(&dev->kobj);
-		kobject_put(&dev->kobj);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1664,7 +1664,6 @@ static void rnbd_destroy_sysfs(struct rnbd_clt_dev *dev,`
`1664`	`1664`	`/* To avoid deadlock firstly remove itself */`
`1665`	`1665`	`sysfs_remove_file_self(&dev->kobj, sysfs_self);`
`1666`	`1666`	`kobject_del(&dev->kobj);`
`1667`		`- kobject_put(&dev->kobj);`
`1668`	`1667`	`}`
`1669`	`1668`	`}`
`1670`	`1669`