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

axboe · axboe · commit 18f2cf232c8c · 2026-03-26T16:04:58.000-06:00
* for-7.1/block:
  drbd: Balance RCU calls in drbd_adm_dump_devices()
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
@@ -3443,8 +3443,10 @@ int drbd_adm_dump_devices(struct sk_buff *skb, struct netlink_callback *cb)
 		if (resource_filter) {
 			retcode = ERR_RES_NOT_KNOWN;
 			resource = drbd_find_resource(nla_data(resource_filter));
-			if (!resource)
+			if (!resource) {
+				rcu_read_lock();
 				goto put_result;
+			}
 			cb->args[0] = (long)resource;
 		}
 	}
@@ -3693,8 +3695,10 @@ int drbd_adm_dump_peer_devices(struct sk_buff *skb, struct netlink_callback *cb)
 		if (resource_filter) {
 			retcode = ERR_RES_NOT_KNOWN;
 			resource = drbd_find_resource(nla_data(resource_filter));
-			if (!resource)
+			if (!resource) {
+				rcu_read_lock();
 				goto put_result;
+			}
 		}
 		cb->args[0] = (long)resource;
 	}

Original file line number	Diff line number	Diff line change
`@@ -3443,8 +3443,10 @@ int drbd_adm_dump_devices(struct sk_buff skb, struct netlink_callback cb)`
`3443`	`3443`	`if (resource_filter) {`
`3444`	`3444`	`retcode = ERR_RES_NOT_KNOWN;`
`3445`	`3445`	`resource = drbd_find_resource(nla_data(resource_filter));`
`3446`		`- if (!resource)`
	`3446`	`+ if (!resource) {`
	`3447`	`+ rcu_read_lock();`
`3447`	`3448`	`goto put_result;`
	`3449`	`+ }`
`3448`	`3450`	`cb->args[0] = (long)resource;`
`3449`	`3451`	`}`
`3450`	`3452`	`}`
`@@ -3693,8 +3695,10 @@ int drbd_adm_dump_peer_devices(struct sk_buff skb, struct netlink_callback cb)`
`3693`	`3695`	`if (resource_filter) {`
`3694`	`3696`	`retcode = ERR_RES_NOT_KNOWN;`
`3695`	`3697`	`resource = drbd_find_resource(nla_data(resource_filter));`
`3696`		`- if (!resource)`
	`3698`	`+ if (!resource) {`
	`3699`	`+ rcu_read_lock();`
`3697`	`3700`	`goto put_result;`
	`3701`	`+ }`
`3698`	`3702`	`}`
`3699`	`3703`	`cb->args[0] = (long)resource;`
`3700`	`3704`	`}`