移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/scsi/device_handler/scsi_dh_emc.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Target driver for EMC CLARiiON AX/CX-series hardware.
3
4
  * Based on code from Lars Marowsky-Bree <lmb@suse.de>
..
..
@@ -5,20 +6,6 @@
5
6
  *
6
7
  * Copyright (C) 2006 Red Hat, Inc.  All rights reserved.
7
8
  * Copyright (C) 2006 Mike Christie
8
- *
9
- * This program is free software; you can redistribute it and/or modify
10
- * it under the terms of the GNU General Public License as published by
11
- * the Free Software Foundation; either version 2, or (at your option)
12
- * any later version.
13
- *
14
- * This program is distributed in the hope that it will be useful,
15
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
16
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
- * GNU General Public License for more details.
18
- *
19
- * You should have received a copy of the GNU General Public License
20
- * along with this program; see the file COPYING.  If not, write to
21
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
22
9
  */
23
10
 #include <linux/slab.h>
24
11
 #include <linux/module.h>
..
..
@@ -341,17 +328,17 @@
341
328
 	return SCSI_RETURN_NOT_HANDLED;
342
329
 }
343
330
 
344
-static int clariion_prep_fn(struct scsi_device *sdev, struct request *req)
331
+static blk_status_t clariion_prep_fn(struct scsi_device *sdev,
332
+		struct request *req)
345
333
 {
346
334
 	struct clariion_dh_data *h = sdev->handler_data;
347
-	int ret = BLKPREP_OK;
348
335
 
349
336
 	if (h->lun_state != CLARIION_LUN_OWNED) {
350
-		ret = BLKPREP_KILL;
351
337
 		req->rq_flags |= RQF_QUIET;
338
+		return BLK_STS_IOERR;
352
339
 	}
353
-	return ret;
354
340
 
341
+	return BLK_STS_OK;
355
342
 }
356
343
 
357
344
 static int clariion_std_inquiry(struct scsi_device *sdev,