From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 06/13] block: move req_gap_back_merge to blk.h Date: Tue, 4 Sep 2018 12:14:24 -0700 Message-ID: <20180904191431.20102-7-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 Tm8gbmVlZCB0byBleHBvc2UgdGhlc2UgaGVscGVycyBvdXRzaWRlIHRoZSBibG9jayBsYXllci4K ClNpZ25lZC1vZmYtYnk6IENocmlzdG9waCBIZWxsd2lnIDxoY2hAbHN0LmRlPgotLS0KIGJsb2Nr L2Jsay5oICAgICAgICAgICAgfCAxOSArKysrKysrKysrKysrKysrKysrCiBpbmNsdWRlL2xpbnV4 L2Jsa2Rldi5oIHwgMTkgLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxOSBp bnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ibG9jay9ibGsuaCBi L2Jsb2NrL2Jsay5oCmluZGV4IDQ0MWMyZGUxZDRiOS4uNjMwMzVjOTU2ODljIDEwMDY0NAotLS0g YS9ibG9jay9ibGsuaAorKysgYi9ibG9jay9ibGsuaApAQCAtMTQ5LDYgKzE0OSwyNSBAQCBzdGF0 aWMgaW5saW5lIHZvaWQgYmxrX3F1ZXVlX2VudGVyX2xpdmUoc3RydWN0IHJlcXVlc3RfcXVldWUg KnEpCiAJcGVyY3B1X3JlZl9nZXQoJnEtPnFfdXNhZ2VfY291bnRlcik7CiB9CiAKK3N0YXRpYyBp bmxpbmUgYm9vbCBfX2J2ZWNfZ2FwX3RvX3ByZXYoc3RydWN0IHJlcXVlc3RfcXVldWUgKnEsCisJ CXN0cnVjdCBiaW9fdmVjICpicHJ2LCB1bnNpZ25lZCBpbnQgb2Zmc2V0KQoreworCXJldHVybiBv ZmZzZXQgfHwKKwkJKChicHJ2LT5idl9vZmZzZXQgKyBicHJ2LT5idl9sZW4pICYgcXVldWVfdmly dF9ib3VuZGFyeShxKSk7Cit9CisKKy8qCisgKiBDaGVjayBpZiBhZGRpbmcgYSBiaW9fdmVjIGFm dGVyIGJwcnYgd2l0aCBvZmZzZXQgd291bGQgY3JlYXRlIGEgZ2FwIGluCisgKiB0aGUgU0cgbGlz dC4gTW9zdCBkcml2ZXJzIGRvbid0IGNhcmUgYWJvdXQgdGhpcywgYnV0IHNvbWUgZG8uCisgKi8K K3N0YXRpYyBpbmxpbmUgYm9vbCBidmVjX2dhcF90b19wcmV2KHN0cnVjdCByZXF1ZXN0X3F1ZXVl ICpxLAorCQlzdHJ1Y3QgYmlvX3ZlYyAqYnBydiwgdW5zaWduZWQgaW50IG9mZnNldCkKK3sKKwlp ZiAoIXF1ZXVlX3ZpcnRfYm91bmRhcnkocSkpCisJCXJldHVybiBmYWxzZTsKKwlyZXR1cm4gX19i dmVjX2dhcF90b19wcmV2KHEsIGJwcnYsIG9mZnNldCk7Cit9CisKICNpZmRlZiBDT05GSUdfQkxL X0RFVl9JTlRFR1JJVFkKIHZvaWQgYmxrX2ZsdXNoX2ludGVncml0eSh2b2lkKTsKIGJvb2wgX19i aW9faW50ZWdyaXR5X2VuZGlvKHN0cnVjdCBiaW8gKik7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xp bnV4L2Jsa2Rldi5oIGIvaW5jbHVkZS9saW51eC9ibGtkZXYuaAppbmRleCBiN2U2NzZiYjAxYmMu LjFkNWUxNDEzOTc5NSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9ibGtkZXYuaAorKysgYi9p bmNsdWRlL2xpbnV4L2Jsa2Rldi5oCkBAIC0xNjc2LDI1ICsxNjc2LDYgQEAgc3RhdGljIGlubGlu ZSB2b2lkIHB1dF9kZXZfc2VjdG9yKFNlY3RvciBwKQogCXB1dF9wYWdlKHAudik7CiB9CiAKLXN0 YXRpYyBpbmxpbmUgYm9vbCBfX2J2ZWNfZ2FwX3RvX3ByZXYoc3RydWN0IHJlcXVlc3RfcXVldWUg KnEsCi0JCQkJc3RydWN0IGJpb192ZWMgKmJwcnYsIHVuc2lnbmVkIGludCBvZmZzZXQpCi17Ci0J cmV0dXJuIG9mZnNldCB8fAotCQkoKGJwcnYtPmJ2X29mZnNldCArIGJwcnYtPmJ2X2xlbikgJiBx dWV1ZV92aXJ0X2JvdW5kYXJ5KHEpKTsKLX0KLQotLyoKLSAqIENoZWNrIGlmIGFkZGluZyBhIGJp b192ZWMgYWZ0ZXIgYnBydiB3aXRoIG9mZnNldCB3b3VsZCBjcmVhdGUgYSBnYXAgaW4KLSAqIHRo ZSBTRyBsaXN0LiBNb3N0IGRyaXZlcnMgZG9uJ3QgY2FyZSBhYm91dCB0aGlzLCBidXQgc29tZSBk by4KLSAqLwotc3RhdGljIGlubGluZSBib29sIGJ2ZWNfZ2FwX3RvX3ByZXYoc3RydWN0IHJlcXVl c3RfcXVldWUgKnEsCi0JCQkJc3RydWN0IGJpb192ZWMgKmJwcnYsIHVuc2lnbmVkIGludCBvZmZz ZXQpCi17Ci0JaWYgKCFxdWV1ZV92aXJ0X2JvdW5kYXJ5KHEpKQotCQlyZXR1cm4gZmFsc2U7Ci0J cmV0dXJuIF9fYnZlY19nYXBfdG9fcHJldihxLCBicHJ2LCBvZmZzZXQpOwotfQotCiBpbnQga2Js b2NrZF9zY2hlZHVsZV93b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yayk7CiBpbnQga2Jsb2Nr ZF9zY2hlZHVsZV93b3JrX29uKGludCBjcHUsIHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yayk7CiBp bnQga2Jsb2NrZF9tb2RfZGVsYXllZF93b3JrX29uKGludCBjcHUsIHN0cnVjdCBkZWxheWVkX3dv cmsgKmR3b3JrLCB1bnNpZ25lZCBsb25nIGRlbGF5KTsKLS0gCjIuMTguMAoKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxp c3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVj dC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=