Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,7/7] Move the resid member from struct scsi_data_buffer into struct scsi_cmnd From: Bart Van Assche Message-Id: <20190123191013.119684-8-bvanassche@acm.org> Date: Wed, 23 Jan 2019 11:10:13 -0800 To: "Martin K . Petersen" , "James E . J . Bottomley" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Oliver Neukum , Douglas Gilbert , Hannes Reinecke , Christoph Hellwig , linux-usb@vger.kernel.org List-ID: VGhpcyBwYXRjaCBkb2VzIG5vdCBjaGFuZ2UgYW55IGZ1bmN0aW9uYWxpdHkgYnV0IHJlZHVjZXMg dGhlIHNpemUgb2YKc3RydWN0IHNjc2lfY21uZC4KCkNjOiBPbGl2ZXIgTmV1a3VtIDxvbmV1a3Vt QHN1c2UuY29tPgpDYzogRG91Z2xhcyBHaWxiZXJ0IDxkZ2lsYmVydEBpbnRlcmxvZy5jb20+CkNj OiBIYW5uZXMgUmVpbmVja2UgPGhhcmVAc3VzZS5jb20+CkNjOiBDaHJpc3RvcGggSGVsbHdpZyA8 aGNoQGxzdC5kZT4KQ2M6IGxpbnV4LXVzYkB2Z2VyLmtlcm5lbC5vcmcKU2lnbmVkLW9mZi1ieTog QmFydCBWYW4gQXNzY2hlIDxidmFuYXNzY2hlQGFjbS5vcmc+Ci0tLQogZHJpdmVycy9zY3NpL3Nj c2lfbGliLmMgICB8IDIgLS0KIGRyaXZlcnMvdXNiL3N0b3JhZ2UvdWFzLmMgfCA4ICsrKysrLS0t CiBpbmNsdWRlL3Njc2kvc2NzaV9jbW5kLmggIHwgOSArKysrLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgOSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L3Njc2kvc2NzaV9saWIuYyBiL2RyaXZlcnMvc2NzaS9zY3NpX2xpYi5jCmluZGV4IGJjYmYyNjZl NDE3Mi4uNGZlYmEzYjVhZmYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL3Njc2kvc2NzaV9saWIuYwor KysgYi9kcml2ZXJzL3Njc2kvc2NzaV9saWIuYwpAQCAtOTQ1LDE0ICs5NDUsMTIgQEAgdm9pZCBz Y3NpX2lvX2NvbXBsZXRpb24oc3RydWN0IHNjc2lfY21uZCAqY21kLCB1bnNpZ25lZCBpbnQgZ29v ZF9ieXRlcykKIAkJICogc2NzaV9yZXN1bHRfdG9fYmxrX3N0YXR1cyBtYXkgaGF2ZSByZXNldCB0 aGUgaG9zdF9ieXRlCiAJCSAqLwogCQlzY3NpX3JlcShyZXEpLT5yZXN1bHQgPSBjbWQtPnJlc3Vs dDsKLQkJc2NzaV9yZXEocmVxKS0+cmVzaWRfbGVuID0gc2NzaV9nZXRfcmVzaWQoY21kKTsKIAog CQlpZiAodW5saWtlbHkoc2NzaV9iaWRpX2NtbmQoY21kKSkpIHsKIAkJCS8qCiAJCQkgKiBCaWRp IGNvbW1hbmRzIE11c3QgYmUgY29tcGxldGUgYXMgYSB3aG9sZSwKIAkJCSAqIGJvdGggc2lkZXMg YXQgb25jZS4KIAkJCSAqLwotCQkJc2NzaV9yZXEocmVxLT5uZXh0X3JxKS0+cmVzaWRfbGVuID0g c2NzaV9pbihjbWQpLT5yZXNpZDsKIAkJCWlmIChzY3NpX2VuZF9yZXF1ZXN0KHJlcSwgQkxLX1NU U19PSywgYmxrX3JxX2J5dGVzKHJlcSksCiAJCQkJCWJsa19ycV9ieXRlcyhyZXEtPm5leHRfcnEp KSkKIAkJCQlXQVJOX09OQ0UodHJ1ZSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3N0b3JhZ2Uv dWFzLmMgYi9kcml2ZXJzL3VzYi9zdG9yYWdlL3Vhcy5jCmluZGV4IDM2NzQyZThlN2VkYy4uZWE0 MGZkNzhlNmZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9zdG9yYWdlL3Vhcy5jCisrKyBiL2Ry aXZlcnMvdXNiL3N0b3JhZ2UvdWFzLmMKQEAgLTM2NSw3ICszNjUsNyBAQCBzdGF0aWMgdm9pZCB1 YXNfc3RhdF9jbXBsdChzdHJ1Y3QgdXJiICp1cmIpCiAKIHN0YXRpYyB2b2lkIHVhc19kYXRhX2Nt cGx0KHN0cnVjdCB1cmIgKnVyYikKIHsKLQlzdHJ1Y3Qgc2NzaV9jbW5kICpjbW5kID0gdXJiLT5j b250ZXh0OworCXN0cnVjdCBzY3NpX2NtbmQgKmNtbmQgPSB1cmItPmNvbnRleHQsICpjbXBsX2Nt ZCA9IE5VTEw7CiAJc3RydWN0IHVhc19jbWRfaW5mbyAqY21kaW5mbyA9ICh2b2lkICopJmNtbmQt PlNDcDsKIAlzdHJ1Y3QgdWFzX2Rldl9pbmZvICpkZXZpbmZvID0gKHZvaWQgKiljbW5kLT5kZXZp Y2UtPmhvc3RkYXRhOwogCXN0cnVjdCBzY3NpX2RhdGFfYnVmZmVyICpzZGIgPSBOVUxMOwpAQCAt Mzc1LDEwICszNzUsMTIgQEAgc3RhdGljIHZvaWQgdWFzX2RhdGFfY21wbHQoc3RydWN0IHVyYiAq dXJiKQogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZpbmZvLT5sb2NrLCBmbGFncyk7CiAKIAlpZiAo Y21kaW5mby0+ZGF0YV9pbl91cmIgPT0gdXJiKSB7CisJCWNtcGxfY21kID0gc2NzaV9pbl9jbWQo Y21uZCk7CiAJCXNkYiA9IHNjc2lfaW4oY21uZCk7CiAJCWNtZGluZm8tPnN0YXRlICY9IH5EQVRB X0lOX1VSQl9JTkZMSUdIVDsKIAkJY21kaW5mby0+ZGF0YV9pbl91cmIgPSBOVUxMOwogCX0gZWxz ZSBpZiAoY21kaW5mby0+ZGF0YV9vdXRfdXJiID09IHVyYikgeworCQljbXBsX2NtZCA9IHNjc2lf b3V0X2NtZChjbW5kKTsKIAkJc2RiID0gc2NzaV9vdXQoY21uZCk7CiAJCWNtZGluZm8tPnN0YXRl ICY9IH5EQVRBX09VVF9VUkJfSU5GTElHSFQ7CiAJCWNtZGluZm8tPmRhdGFfb3V0X3VyYiA9IE5V TEw7CkBAIC00MDEsOSArNDAzLDkgQEAgc3RhdGljIHZvaWQgdWFzX2RhdGFfY21wbHQoc3RydWN0 IHVyYiAqdXJiKQogCQlpZiAoc3RhdHVzICE9IC1FTk9FTlQgJiYgc3RhdHVzICE9IC1FQ09OTlJF U0VUICYmIHN0YXR1cyAhPSAtRVNIVVRET1dOKQogCQkJdWFzX2xvZ19jbWRfc3RhdGUoY21uZCwg ImRhdGEgY21wbHQgZXJyIiwgc3RhdHVzKTsKIAkJLyogZXJyb3I6IG5vIGRhdGEgdHJhbnNmZXJl ZCAqLwotCQlzZGItPnJlc2lkID0gc2RiLT5sZW5ndGg7CisJCWNtcGxfY21kLT5yZXEucmVzaWRf bGVuID0gc2RiLT5sZW5ndGg7CiAJfSBlbHNlIHsKLQkJc2RiLT5yZXNpZCA9IHNkYi0+bGVuZ3Ro IC0gdXJiLT5hY3R1YWxfbGVuZ3RoOworCQljbXBsX2NtZC0+cmVxLnJlc2lkX2xlbiA9IHNkYi0+ bGVuZ3RoIC0gdXJiLT5hY3R1YWxfbGVuZ3RoOwogCX0KIAl1YXNfdHJ5X2NvbXBsZXRlKGNtbmQs IF9fZnVuY19fKTsKIG91dDoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvc2NzaS9zY3NpX2NtbmQuaCBi L2luY2x1ZGUvc2NzaS9zY3NpX2NtbmQuaAppbmRleCA4ZjNlZDU1YTVlZTUuLjkwMzVjNzYwY2Fl MCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9zY3NpL3Njc2lfY21uZC5oCisrKyBiL2luY2x1ZGUvc2Nz aS9zY3NpX2NtbmQuaApAQCAtMzUsNyArMzUsNiBAQCBzdHJ1Y3Qgc2NzaV9kcml2ZXI7CiBzdHJ1 Y3Qgc2NzaV9kYXRhX2J1ZmZlciB7CiAJc3RydWN0IHNnX3RhYmxlIHRhYmxlOwogCXVuc2lnbmVk IGxlbmd0aDsKLQlpbnQgcmVzaWQ7CiB9OwogCiAvKiBlbWJlZGRlZCBpbiBzY3NpX2NtbmQgKi8K QEAgLTIyOSwyMiArMjI4LDIyIEBAIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgc2NzaV9idWZmbGVu KHN0cnVjdCBzY3NpX2NtbmQgKmNtZCkKIAogc3RhdGljIGlubGluZSB2b2lkIHNjc2lfaW5fc2V0 X3Jlc2lkKHN0cnVjdCBzY3NpX2NtbmQgKmNtZCwgaW50IHJlc2lkKQogewotCXNjc2lfaW5fY21k KGNtZCktPnNkYi5yZXNpZCA9IHJlc2lkOworCXNjc2lfaW5fY21kKGNtZCktPnJlcS5yZXNpZF9s ZW4gPSByZXNpZDsKIH0KIAogc3RhdGljIGlubGluZSBpbnQgc2NzaV9pbl9nZXRfcmVzaWQoc3Ry dWN0IHNjc2lfY21uZCAqY21kKQogewotCXJldHVybiBzY3NpX2luX2NtZChjbWQpLT5zZGIucmVz aWQ7CisJcmV0dXJuIHNjc2lfaW5fY21kKGNtZCktPnJlcS5yZXNpZF9sZW47CiB9CiAKIHN0YXRp YyBpbmxpbmUgdm9pZCBzY3NpX291dF9zZXRfcmVzaWQoc3RydWN0IHNjc2lfY21uZCAqY21kLCBp bnQgcmVzaWQpCiB7Ci0JY21kLT5zZGIucmVzaWQgPSByZXNpZDsKKwljbWQtPnJlcS5yZXNpZF9s ZW4gPSByZXNpZDsKIH0KIAogc3RhdGljIGlubGluZSBpbnQgc2NzaV9vdXRfZ2V0X3Jlc2lkKHN0 cnVjdCBzY3NpX2NtbmQgKmNtZCkKIHsKLQlyZXR1cm4gY21kLT5zZGIucmVzaWQ7CisJcmV0dXJu IGNtZC0+cmVxLnJlc2lkX2xlbjsKIH0KIAogc3RhdGljIGlubGluZSB2b2lkIHNjc2lfc2V0X3Jl c2lkKHN0cnVjdCBzY3NpX2NtbmQgKmNtZCwgaW50IHJlc2lkKQo=