From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 04/13] block: move integrity_req_gap_{back, front}_merge to blk.h Date: Tue, 4 Sep 2018 12:14:22 -0700 Message-ID: <20180904191431.20102-5-hch@lst.de> References: <20180904191431.20102-1-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180904191431.20102-1-hch@lst.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Jens Axboe Cc: linux-block@vger.kernel.org, xen-devel@lists.xen.org, linux-arm-kernel@lists.infradead.org, Ming Lei List-Id: xen-devel@lists.xenproject.org Tm8gbmVlZCB0byBleHBvc2UgdGhlc2UgdG8gZHJpdmVycy4KClNpZ25lZC1vZmYtYnk6IENocmlz dG9waCBIZWxsd2lnIDxoY2hAbHN0LmRlPgotLS0KIGJsb2NrL2Jsay5oICAgICAgICAgICAgfCAz NSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogaW5jbHVkZS9saW51eC9ibGtk ZXYuaCB8IDMxIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdl ZCwgMzMgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYmxvY2sv YmxrLmggYi9ibG9jay9ibGsuaAppbmRleCA5ZGI0ZTM4OTU4MmMuLjQ0MWMyZGUxZDRiOSAxMDA2 NDQKLS0tIGEvYmxvY2svYmxrLmgKKysrIGIvYmxvY2svYmxrLmgKQEAgLTE1OCw3ICsxNTgsMzgg QEAgc3RhdGljIGlubGluZSBib29sIGJpb19pbnRlZ3JpdHlfZW5kaW8oc3RydWN0IGJpbyAqYmlv KQogCQlyZXR1cm4gX19iaW9faW50ZWdyaXR5X2VuZGlvKGJpbyk7CiAJcmV0dXJuIHRydWU7CiB9 Ci0jZWxzZQorCitzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWdyaXR5X3JlcV9nYXBfYmFja19tZXJn ZShzdHJ1Y3QgcmVxdWVzdCAqcmVxLAorCQlzdHJ1Y3QgYmlvICpuZXh0KQoreworCXN0cnVjdCBi aW9faW50ZWdyaXR5X3BheWxvYWQgKmJpcCA9IGJpb19pbnRlZ3JpdHkocmVxLT5iaW8pOworCXN0 cnVjdCBiaW9faW50ZWdyaXR5X3BheWxvYWQgKmJpcF9uZXh0ID0gYmlvX2ludGVncml0eShuZXh0 KTsKKworCXJldHVybiBidmVjX2dhcF90b19wcmV2KHJlcS0+cSwgJmJpcC0+YmlwX3ZlY1tiaXAt PmJpcF92Y250IC0gMV0sCisJCQkJYmlwX25leHQtPmJpcF92ZWNbMF0uYnZfb2Zmc2V0KTsKK30K Kworc3RhdGljIGlubGluZSBib29sIGludGVncml0eV9yZXFfZ2FwX2Zyb250X21lcmdlKHN0cnVj dCByZXF1ZXN0ICpyZXEsCisJCXN0cnVjdCBiaW8gKmJpbykKK3sKKwlzdHJ1Y3QgYmlvX2ludGVn cml0eV9wYXlsb2FkICpiaXAgPSBiaW9faW50ZWdyaXR5KGJpbyk7CisJc3RydWN0IGJpb19pbnRl Z3JpdHlfcGF5bG9hZCAqYmlwX25leHQgPSBiaW9faW50ZWdyaXR5KHJlcS0+YmlvKTsKKworCXJl dHVybiBidmVjX2dhcF90b19wcmV2KHJlcS0+cSwgJmJpcC0+YmlwX3ZlY1tiaXAtPmJpcF92Y250 IC0gMV0sCisJCQkJYmlwX25leHQtPmJpcF92ZWNbMF0uYnZfb2Zmc2V0KTsKK30KKyNlbHNlIC8q IENPTkZJR19CTEtfREVWX0lOVEVHUklUWSAqLworc3RhdGljIGlubGluZSBib29sIGludGVncml0 eV9yZXFfZ2FwX2JhY2tfbWVyZ2Uoc3RydWN0IHJlcXVlc3QgKnJlcSwKKwkJc3RydWN0IGJpbyAq bmV4dCkKK3sKKwlyZXR1cm4gZmFsc2U7Cit9CitzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWdyaXR5 X3JlcV9nYXBfZnJvbnRfbWVyZ2Uoc3RydWN0IHJlcXVlc3QgKnJlcSwKKwkJc3RydWN0IGJpbyAq YmlvKQoreworCXJldHVybiBmYWxzZTsKK30KKwogc3RhdGljIGlubGluZSB2b2lkIGJsa19mbHVz aF9pbnRlZ3JpdHkodm9pZCkKIHsKIH0KQEAgLTE2Niw3ICsxOTcsNyBAQCBzdGF0aWMgaW5saW5l IGJvb2wgYmlvX2ludGVncml0eV9lbmRpbyhzdHJ1Y3QgYmlvICpiaW8pCiB7CiAJcmV0dXJuIHRy dWU7CiB9Ci0jZW5kaWYKKyNlbmRpZiAvKiBDT05GSUdfQkxLX0RFVl9JTlRFR1JJVFkgKi8KIAog dm9pZCBibGtfdGltZW91dF93b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yayk7CiB1bnNpZ25l ZCBsb25nIGJsa19ycV90aW1lb3V0KHVuc2lnbmVkIGxvbmcgdGltZW91dCk7CmRpZmYgLS1naXQg YS9pbmNsdWRlL2xpbnV4L2Jsa2Rldi5oIGIvaW5jbHVkZS9saW51eC9ibGtkZXYuaAppbmRleCBk Njg2OWUwZTJiNjQuLmJjNTM0Yzg1NzM0NCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9ibGtk ZXYuaAorKysgYi9pbmNsdWRlL2xpbnV4L2Jsa2Rldi5oCkBAIC0xODQzLDI2ICsxODQzLDYgQEAg cXVldWVfbWF4X2ludGVncml0eV9zZWdtZW50cyhzdHJ1Y3QgcmVxdWVzdF9xdWV1ZSAqcSkKIAly ZXR1cm4gcS0+bGltaXRzLm1heF9pbnRlZ3JpdHlfc2VnbWVudHM7CiB9CiAKLXN0YXRpYyBpbmxp bmUgYm9vbCBpbnRlZ3JpdHlfcmVxX2dhcF9iYWNrX21lcmdlKHN0cnVjdCByZXF1ZXN0ICpyZXEs Ci0JCQkJCQlzdHJ1Y3QgYmlvICpuZXh0KQotewotCXN0cnVjdCBiaW9faW50ZWdyaXR5X3BheWxv YWQgKmJpcCA9IGJpb19pbnRlZ3JpdHkocmVxLT5iaW8pOwotCXN0cnVjdCBiaW9faW50ZWdyaXR5 X3BheWxvYWQgKmJpcF9uZXh0ID0gYmlvX2ludGVncml0eShuZXh0KTsKLQotCXJldHVybiBidmVj X2dhcF90b19wcmV2KHJlcS0+cSwgJmJpcC0+YmlwX3ZlY1tiaXAtPmJpcF92Y250IC0gMV0sCi0J CQkJYmlwX25leHQtPmJpcF92ZWNbMF0uYnZfb2Zmc2V0KTsKLX0KLQotc3RhdGljIGlubGluZSBi b29sIGludGVncml0eV9yZXFfZ2FwX2Zyb250X21lcmdlKHN0cnVjdCByZXF1ZXN0ICpyZXEsCi0J CQkJCQkgc3RydWN0IGJpbyAqYmlvKQotewotCXN0cnVjdCBiaW9faW50ZWdyaXR5X3BheWxvYWQg KmJpcCA9IGJpb19pbnRlZ3JpdHkoYmlvKTsKLQlzdHJ1Y3QgYmlvX2ludGVncml0eV9wYXlsb2Fk ICpiaXBfbmV4dCA9IGJpb19pbnRlZ3JpdHkocmVxLT5iaW8pOwotCi0JcmV0dXJuIGJ2ZWNfZ2Fw X3RvX3ByZXYocmVxLT5xLCAmYmlwLT5iaXBfdmVjW2JpcC0+YmlwX3ZjbnQgLSAxXSwKLQkJCQli aXBfbmV4dC0+YmlwX3ZlY1swXS5idl9vZmZzZXQpOwotfQotCiAvKioKICAqIGJpb19pbnRlZ3Jp dHlfaW50ZXJ2YWxzIC0gUmV0dXJuIG51bWJlciBvZiBpbnRlZ3JpdHkgaW50ZXJ2YWxzIGZvciBh IGJpbwogICogQGJpOgkJYmxrX2ludGVncml0eSBwcm9maWxlIGZvciBkZXZpY2UKQEAgLTE5NDcs MTcgKzE5MjcsNiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgYmxrX2ludGVncml0eV9tZXJnZV9iaW8o c3RydWN0IHJlcXVlc3RfcXVldWUgKnJxLAogCXJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgaW5s aW5lIGJvb2wgaW50ZWdyaXR5X3JlcV9nYXBfYmFja19tZXJnZShzdHJ1Y3QgcmVxdWVzdCAqcmVx LAotCQkJCQkJc3RydWN0IGJpbyAqbmV4dCkKLXsKLQlyZXR1cm4gZmFsc2U7Ci19Ci1zdGF0aWMg aW5saW5lIGJvb2wgaW50ZWdyaXR5X3JlcV9nYXBfZnJvbnRfbWVyZ2Uoc3RydWN0IHJlcXVlc3Qg KnJlcSwKLQkJCQkJCSBzdHJ1Y3QgYmlvICpiaW8pCi17Ci0JcmV0dXJuIGZhbHNlOwotfQotCiBz dGF0aWMgaW5saW5lIHVuc2lnbmVkIGludCBiaW9faW50ZWdyaXR5X2ludGVydmFscyhzdHJ1Y3Qg YmxrX2ludGVncml0eSAqYmksCiAJCQkJCQkgICB1bnNpZ25lZCBpbnQgc2VjdG9ycykKIHsKLS0g CjIuMTguMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Clhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0 dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=