forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da 
 kernel/drivers/scsi/xen-scsifront.c
....@@ -233,12 +233,11 @@
233233 		return;
234234 
235235 	for (i = 0; i < shadow->nr_grants; i++) {
236
-		if (unlikely(gnttab_query_foreign_access(shadow->gref[i]))) {
236
+		if (unlikely(!gnttab_try_end_foreign_access(shadow->gref[i]))) {
237237 			shost_printk(KERN_ALERT, info->host, KBUILD_MODNAME
238238 				     "grant still in use by backend\n");
239239 			BUG();
240240 		}
241
-		gnttab_end_foreign_access(shadow->gref[i], 0, 0UL);
242241 	}
243242 
244243 	kfree(shadow->sg);
....@@ -696,7 +695,6 @@
696695 	.this_id		= -1,
697696 	.cmd_size		= sizeof(struct vscsifrnt_shadow),
698697 	.sg_tablesize		= VSCSIIF_SG_TABLESIZE,
699
-	.use_clustering		= DISABLE_CLUSTERING,
700698 	.proc_name		= "scsifront",
701699 };
702700 
....@@ -1112,7 +1110,7 @@
11121110 	case XenbusStateClosed:
11131111 		if (dev->state == XenbusStateClosed)
11141112 			break;
1115
-		/* Missed the backend's Closing state -- fallthrough */
1113
+		fallthrough;	/* Missed the backend's Closing state */
11161114 	case XenbusStateClosing:
11171115 		scsifront_disconnect(info);
11181116 		break;