소스 검색

[SCSI] target: Fix bogus return in transport_add_device_to_core_hba failure path

This patch removes a bogus conditional+return check within the failure path
of transport_add_device_to_core_hba().  This breakage was introduced during
the v4 conversion to remove struct se_cmd passthrough ops for INQUIRY /
READ_CAPCITY during struct se_device creation and registration process.

Reported-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Nicholas Bellinger 14 년 전
부모
커밋
12a18bdc27
1개의 변경된 파일2개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 3
      drivers/target/target_core_transport.c

+ 2 - 3
drivers/target/target_core_transport.c

@@ -1620,7 +1620,7 @@ struct se_device *transport_add_device_to_core_hba(
 	const char *inquiry_prod,
 	const char *inquiry_prod,
 	const char *inquiry_rev)
 	const char *inquiry_rev)
 {
 {
-	int ret = 0, force_pt;
+	int force_pt;
 	struct se_device  *dev;
 	struct se_device  *dev;
 
 
 	dev = kzalloc(sizeof(struct se_device), GFP_KERNEL);
 	dev = kzalloc(sizeof(struct se_device), GFP_KERNEL);
@@ -1737,9 +1737,8 @@ struct se_device *transport_add_device_to_core_hba(
 	}
 	}
 	scsi_dump_inquiry(dev);
 	scsi_dump_inquiry(dev);
 
 
+	return dev;
 out:
 out:
-	if (!ret)
-		return dev;
 	kthread_stop(dev->process_thread);
 	kthread_stop(dev->process_thread);
 
 
 	spin_lock(&hba->device_lock);
 	spin_lock(&hba->device_lock);