Commit 74e2f211 authored by Stefan Haberland's avatar Stefan Haberland Committed by Jens Axboe
Browse files

s390/dasd: move dasd_eckd_read_fc_security 



dasd_eckd_read_conf is called multiple times during device setup but the
fc_security feature needs to be read only once. So move it into the calling
function.

Signed-off-by: default avatarStefan Haberland <sth@linux.ibm.com>
Reviewed-by: default avatarJan Hoeppner <hoeppner@linux.ibm.com>
Link: https://lore.kernel.org/r/20211020115124.1735254-5-sth@linux.ibm.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 23596961

drivers/s390/block/dasd_eckd.c

+3 −2
Original line number Diff line number Diff line
@@ -1189,8 +1189,6 @@ static int dasd_eckd_read_conf(struct dasd_device *device) 
		}

	}



	dasd_eckd_read_fc_security(device);



	return path_err;

}
@@ -2101,6 +2099,7 @@ dasd_eckd_check_characteristics(struct dasd_device *device) 
	if (rc)

		goto out_err3;



	dasd_eckd_read_fc_security(device);

	dasd_path_create_kobjects(device);



	/* Read Feature Codes */
@@ -5788,6 +5787,8 @@ static int dasd_eckd_reload_device(struct dasd_device *device) 
	if (rc)

		goto out_err;



	dasd_eckd_read_fc_security(device);



	rc = dasd_eckd_generate_uid(device);

	if (rc)

		goto out_err;