Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Stefan Haberland <sth@linux.ibm.com>
Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
Link: https://lore.kernel.org/r/20211020115124.1735254-5-sth@linux.ibm.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Stefan Haberland and committed by
Jens Axboe
74e2f211 23596961

+3 -2
+3 -2
drivers/s390/block/dasd_eckd.c
··· 1189 1189 } 1190 1190 } 1191 1191 1192 - dasd_eckd_read_fc_security(device); 1193 - 1194 1192 return path_err; 1195 1193 } 1196 1194 ··· 2099 2101 if (rc) 2100 2102 goto out_err3; 2101 2103 2104 + dasd_eckd_read_fc_security(device); 2102 2105 dasd_path_create_kobjects(device); 2103 2106 2104 2107 /* Read Feature Codes */ ··· 5786 5787 rc = dasd_eckd_read_conf(device); 5787 5788 if (rc) 5788 5789 goto out_err; 5790 + 5791 + dasd_eckd_read_fc_security(device); 5789 5792 5790 5793 rc = dasd_eckd_generate_uid(device); 5791 5794 if (rc)