From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Arnd Bergmann To: Yan Zheng , Sage Weil , Ilya Dryomov , Alex Elder Cc: y2038@lists.linaro.org, ceph-devel@vger.kernel.org, Arnd Bergmann , Jens Axboe , "David S. Miller" , "Martin K. Petersen" , Jason Dillaman , Daniel Jordan , Jan Kara , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 4/5] ceph: use timespec64 for r_mtime Date: Wed, 20 Jun 2018 17:50:36 +0200 Message-Id: <20180620155101.57685-4-arnd@arndb.de> In-Reply-To: <20180620155101.57685-1-arnd@arndb.de> References: <20180620155101.57685-1-arnd@arndb.de> List-ID: The request mtime field is used all over ceph, and is currently represented as a 'timespec' structure in Linux. This changes it to timespec64 to allow times beyond 2038, modifying all users at the same time. Signed-off-by: Arnd Bergmann --- drivers/block/rbd.c | 2 +- fs/ceph/addr.c | 12 ++++++------ fs/ceph/file.c | 11 +++++------ include/linux/ceph/osd_client.h | 6 +++--- net/ceph/osd_client.c | 8 ++++---- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index fa0729c1e776..356936333cd9 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1452,7 +1452,7 @@ static void rbd_osd_req_format_write(struct rbd_obj_request *obj_request) struct ceph_osd_request *osd_req = obj_request->osd_req; osd_req->r_flags = CEPH_OSD_FLAG_WRITE; - ktime_get_real_ts(&osd_req->r_mtime); + ktime_get_real_ts64(&osd_req->r_mtime); osd_req->r_data_offset = obj_request->ex.oe_off; } diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 292b3d72d725..d44d51e69e76 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -574,7 +574,7 @@ static u64 get_writepages_data_length(struct inode *inode, */ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) { - struct timespec ts; + struct timespec64 ts; struct inode *inode; struct ceph_inode_info *ci; struct ceph_fs_client *fsc; @@ -625,7 +625,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) set_bdi_congested(inode_to_bdi(inode), BLK_RW_ASYNC); set_page_writeback(page); - ts = timespec64_to_timespec(inode->i_mtime); + ts = inode->i_mtime; err = ceph_osdc_writepages(&fsc->client->osdc, ceph_vino(inode), &ci->i_layout, snapc, page_off, len, ceph_wbc.truncate_seq, @@ -1134,7 +1134,7 @@ static int ceph_writepages_start(struct address_space *mapping, pages = NULL; } - req->r_mtime = timespec64_to_timespec(inode->i_mtime); + req->r_mtime = inode->i_mtime; rc = ceph_osdc_start_request(&fsc->client->osdc, req, true); BUG_ON(rc); req = NULL; @@ -1734,7 +1734,7 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page) goto out; } - req->r_mtime = timespec64_to_timespec(inode->i_mtime); + req->r_mtime = inode->i_mtime; err = ceph_osdc_start_request(&fsc->client->osdc, req, false); if (!err) err = ceph_osdc_wait_request(&fsc->client->osdc, req); @@ -1776,7 +1776,7 @@ int ceph_uninline_data(struct file *filp, struct page *locked_page) goto out_put; } - req->r_mtime = timespec64_to_timespec(inode->i_mtime); + req->r_mtime = inode->i_mtime; err = ceph_osdc_start_request(&fsc->client->osdc, req, false); if (!err) err = ceph_osdc_wait_request(&fsc->client->osdc, req); @@ -1937,7 +1937,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci, 0, false, true); err = ceph_osdc_start_request(&fsc->client->osdc, rd_req, false); - wr_req->r_mtime = timespec64_to_timespec(ci->vfs_inode.i_mtime); + wr_req->r_mtime = ci->vfs_inode.i_mtime; err2 = ceph_osdc_start_request(&fsc->client->osdc, wr_req, false); if (!err) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index ad0bed99b1d5..1795a8dc9a1e 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -721,7 +721,7 @@ struct ceph_aio_request { struct list_head osd_reqs; unsigned num_reqs; atomic_t pending_reqs; - struct timespec mtime; + struct timespec64 mtime; struct ceph_cap_flush *prealloc_cf; }; @@ -923,7 +923,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, int num_pages = 0; int flags; int ret; - struct timespec mtime = timespec64_to_timespec(current_time(inode)); + struct timespec64 mtime = current_time(inode); size_t count = iov_iter_count(iter); loff_t pos = iocb->ki_pos; bool write = iov_iter_rw(iter) == WRITE; @@ -1013,7 +1013,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, truncate_inode_pages_range(inode->i_mapping, pos, (pos+len) | (PAGE_SIZE - 1)); - req->r_mtime = mtime; + req->r_mtime = current_time(inode); } osd_req_op_extent_osd_data_bvecs(req, 0, bvecs, num_pages, len); @@ -1131,7 +1131,6 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, int flags; int ret; bool check_caps = false; - struct timespec mtime = timespec64_to_timespec(current_time(inode)); size_t count = iov_iter_count(from); if (ceph_snap(file_inode(file)) != CEPH_NOSNAP) @@ -1201,7 +1200,7 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, osd_req_op_extent_osd_data_pages(req, 0, pages, len, 0, false, true); - req->r_mtime = mtime; + req->r_mtime = current_time(inode); ret = ceph_osdc_start_request(&fsc->client->osdc, req, false); if (!ret) ret = ceph_osdc_wait_request(&fsc->client->osdc, req); @@ -1663,7 +1662,7 @@ static int ceph_zero_partial_object(struct inode *inode, goto out; } - req->r_mtime = timespec64_to_timespec(inode->i_mtime); + req->r_mtime = inode->i_mtime; ret = ceph_osdc_start_request(&fsc->client->osdc, req, false); if (!ret) { ret = ceph_osdc_wait_request(&fsc->client->osdc, req); diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 0d6ee04b4c41..2e6611c1e9a0 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -199,7 +199,7 @@ struct ceph_osd_request { /* set by submitter */ u64 r_snapid; /* for reads, CEPH_NOSNAP o/w */ struct ceph_snap_context *r_snapc; /* for writes */ - struct timespec r_mtime; /* ditto */ + struct timespec64 r_mtime; /* ditto */ u64 r_data_offset; /* ditto */ bool r_linger; /* don't resend on failure */ @@ -253,7 +253,7 @@ struct ceph_osd_linger_request { struct ceph_osd_request_target t; u32 map_dne_bound; - struct timespec mtime; + struct timespec64 mtime; struct kref kref; struct mutex lock; @@ -508,7 +508,7 @@ extern int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_snap_context *sc, u64 off, u64 len, u32 truncate_seq, u64 truncate_size, - struct timespec *mtime, + struct timespec64 *mtime, struct page **pages, int nr_pages); /* watch/notify */ diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index a00c74f1154e..a87a021ca9d0 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1978,7 +1978,7 @@ static void encode_request_partial(struct ceph_osd_request *req, p += sizeof(struct ceph_blkin_trace_info); ceph_encode_32(&p, 0); /* client_inc, always 0 */ - ceph_encode_timespec(p, &req->r_mtime); + ceph_encode_timespec64(p, &req->r_mtime); p += sizeof(struct ceph_timespec); encode_oloc(&p, end, &req->r_t.target_oloc); @@ -4512,7 +4512,7 @@ ceph_osdc_watch(struct ceph_osd_client *osdc, ceph_oid_copy(&lreq->t.base_oid, oid); ceph_oloc_copy(&lreq->t.base_oloc, oloc); lreq->t.flags = CEPH_OSD_FLAG_WRITE; - ktime_get_real_ts(&lreq->mtime); + ktime_get_real_ts64(&lreq->mtime); lreq->reg_req = alloc_linger_request(lreq); if (!lreq->reg_req) { @@ -4570,7 +4570,7 @@ int ceph_osdc_unwatch(struct ceph_osd_client *osdc, ceph_oid_copy(&req->r_base_oid, &lreq->t.base_oid); ceph_oloc_copy(&req->r_base_oloc, &lreq->t.base_oloc); req->r_flags = CEPH_OSD_FLAG_WRITE; - ktime_get_real_ts(&req->r_mtime); + ktime_get_real_ts64(&req->r_mtime); osd_req_op_watch_init(req, 0, lreq->linger_id, CEPH_OSD_WATCH_OP_UNWATCH); @@ -5136,7 +5136,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, struct ceph_snap_context *snapc, u64 off, u64 len, u32 truncate_seq, u64 truncate_size, - struct timespec *mtime, + struct timespec64 *mtime, struct page **pages, int num_pages) { struct ceph_osd_request *req; -- 2.9.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH 4/5] ceph: use timespec64 for r_mtime Date: Wed, 20 Jun 2018 17:50:36 +0200 Message-ID: <20180620155101.57685-4-arnd@arndb.de> References: <20180620155101.57685-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: Jens Axboe , Jan Kara , "Martin K. Petersen" , Arnd Bergmann , y2038@lists.linaro.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Jordan , linux-block@vger.kernel.org, ceph-devel@vger.kernel.org, Jason Dillaman , "David S. Miller" To: Yan Zheng , Sage Weil , Ilya Dryomov , Alex Elder Return-path: In-Reply-To: <20180620155101.57685-1-arnd@arndb.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" List-Id: netdev.vger.kernel.org VGhlIHJlcXVlc3QgbXRpbWUgZmllbGQgaXMgdXNlZCBhbGwgb3ZlciBjZXBoLCBhbmQgaXMgY3Vy cmVudGx5CnJlcHJlc2VudGVkIGFzIGEgJ3RpbWVzcGVjJyBzdHJ1Y3R1cmUgaW4gTGludXguIFRo aXMgY2hhbmdlcyBpdCB0bwp0aW1lc3BlYzY0IHRvIGFsbG93IHRpbWVzIGJleW9uZCAyMDM4LCBt b2RpZnlpbmcgYWxsIHVzZXJzIGF0IHRoZQpzYW1lIHRpbWUuCgpTaWduZWQtb2ZmLWJ5OiBBcm5k IEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPgotLS0KIGRyaXZlcnMvYmxvY2svcmJkLmMgICAgICAg ICAgICAgfCAgMiArLQogZnMvY2VwaC9hZGRyLmMgICAgICAgICAgICAgICAgICB8IDEyICsrKysr Ky0tLS0tLQogZnMvY2VwaC9maWxlLmMgICAgICAgICAgICAgICAgICB8IDExICsrKysrLS0tLS0t CiBpbmNsdWRlL2xpbnV4L2NlcGgvb3NkX2NsaWVudC5oIHwgIDYgKysrLS0tCiBuZXQvY2VwaC9v c2RfY2xpZW50LmMgICAgICAgICAgIHwgIDggKysrKy0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgMTkg aW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ibG9j ay9yYmQuYyBiL2RyaXZlcnMvYmxvY2svcmJkLmMKaW5kZXggZmEwNzI5YzFlNzc2Li4zNTY5MzYz MzNjZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvYmxvY2svcmJkLmMKKysrIGIvZHJpdmVycy9ibG9j ay9yYmQuYwpAQCAtMTQ1Miw3ICsxNDUyLDcgQEAgc3RhdGljIHZvaWQgcmJkX29zZF9yZXFfZm9y bWF0X3dyaXRlKHN0cnVjdCByYmRfb2JqX3JlcXVlc3QgKm9ial9yZXF1ZXN0KQogCXN0cnVjdCBj ZXBoX29zZF9yZXF1ZXN0ICpvc2RfcmVxID0gb2JqX3JlcXVlc3QtPm9zZF9yZXE7CiAKIAlvc2Rf cmVxLT5yX2ZsYWdzID0gQ0VQSF9PU0RfRkxBR19XUklURTsKLQlrdGltZV9nZXRfcmVhbF90cygm b3NkX3JlcS0+cl9tdGltZSk7CisJa3RpbWVfZ2V0X3JlYWxfdHM2NCgmb3NkX3JlcS0+cl9tdGlt ZSk7CiAJb3NkX3JlcS0+cl9kYXRhX29mZnNldCA9IG9ial9yZXF1ZXN0LT5leC5vZV9vZmY7CiB9 CiAKZGlmZiAtLWdpdCBhL2ZzL2NlcGgvYWRkci5jIGIvZnMvY2VwaC9hZGRyLmMKaW5kZXggMjky YjNkNzJkNzI1Li5kNDRkNTFlNjllNzYgMTAwNjQ0Ci0tLSBhL2ZzL2NlcGgvYWRkci5jCisrKyBi L2ZzL2NlcGgvYWRkci5jCkBAIC01NzQsNyArNTc0LDcgQEAgc3RhdGljIHU2NCBnZXRfd3JpdGVw YWdlc19kYXRhX2xlbmd0aChzdHJ1Y3QgaW5vZGUgKmlub2RlLAogICovCiBzdGF0aWMgaW50IHdy aXRlcGFnZV9ub3VubG9jayhzdHJ1Y3QgcGFnZSAqcGFnZSwgc3RydWN0IHdyaXRlYmFja19jb250 cm9sICp3YmMpCiB7Ci0Jc3RydWN0IHRpbWVzcGVjIHRzOworCXN0cnVjdCB0aW1lc3BlYzY0IHRz OwogCXN0cnVjdCBpbm9kZSAqaW5vZGU7CiAJc3RydWN0IGNlcGhfaW5vZGVfaW5mbyAqY2k7CiAJ c3RydWN0IGNlcGhfZnNfY2xpZW50ICpmc2M7CkBAIC02MjUsNyArNjI1LDcgQEAgc3RhdGljIGlu dCB3cml0ZXBhZ2Vfbm91bmxvY2soc3RydWN0IHBhZ2UgKnBhZ2UsIHN0cnVjdCB3cml0ZWJhY2tf Y29udHJvbCAqd2JjKQogCQlzZXRfYmRpX2Nvbmdlc3RlZChpbm9kZV90b19iZGkoaW5vZGUpLCBC TEtfUldfQVNZTkMpOwogCiAJc2V0X3BhZ2Vfd3JpdGViYWNrKHBhZ2UpOwotCXRzID0gdGltZXNw ZWM2NF90b190aW1lc3BlYyhpbm9kZS0+aV9tdGltZSk7CisJdHMgPSBpbm9kZS0+aV9tdGltZTsK IAllcnIgPSBjZXBoX29zZGNfd3JpdGVwYWdlcygmZnNjLT5jbGllbnQtPm9zZGMsIGNlcGhfdmlu byhpbm9kZSksCiAJCQkJICAgJmNpLT5pX2xheW91dCwgc25hcGMsIHBhZ2Vfb2ZmLCBsZW4sCiAJ CQkJICAgY2VwaF93YmMudHJ1bmNhdGVfc2VxLApAQCAtMTEzNCw3ICsxMTM0LDcgQEAgc3RhdGlj IGludCBjZXBoX3dyaXRlcGFnZXNfc3RhcnQoc3RydWN0IGFkZHJlc3Nfc3BhY2UgKm1hcHBpbmcs CiAJCQlwYWdlcyA9IE5VTEw7CiAJCX0KIAotCQlyZXEtPnJfbXRpbWUgPSB0aW1lc3BlYzY0X3Rv X3RpbWVzcGVjKGlub2RlLT5pX210aW1lKTsKKwkJcmVxLT5yX210aW1lID0gaW5vZGUtPmlfbXRp bWU7CiAJCXJjID0gY2VwaF9vc2RjX3N0YXJ0X3JlcXVlc3QoJmZzYy0+Y2xpZW50LT5vc2RjLCBy ZXEsIHRydWUpOwogCQlCVUdfT04ocmMpOwogCQlyZXEgPSBOVUxMOwpAQCAtMTczNCw3ICsxNzM0 LDcgQEAgaW50IGNlcGhfdW5pbmxpbmVfZGF0YShzdHJ1Y3QgZmlsZSAqZmlscCwgc3RydWN0IHBh Z2UgKmxvY2tlZF9wYWdlKQogCQlnb3RvIG91dDsKIAl9CiAKLQlyZXEtPnJfbXRpbWUgPSB0aW1l c3BlYzY0X3RvX3RpbWVzcGVjKGlub2RlLT5pX210aW1lKTsKKwlyZXEtPnJfbXRpbWUgPSBpbm9k ZS0+aV9tdGltZTsKIAllcnIgPSBjZXBoX29zZGNfc3RhcnRfcmVxdWVzdCgmZnNjLT5jbGllbnQt Pm9zZGMsIHJlcSwgZmFsc2UpOwogCWlmICghZXJyKQogCQllcnIgPSBjZXBoX29zZGNfd2FpdF9y ZXF1ZXN0KCZmc2MtPmNsaWVudC0+b3NkYywgcmVxKTsKQEAgLTE3NzYsNyArMTc3Niw3IEBAIGlu dCBjZXBoX3VuaW5saW5lX2RhdGEoc3RydWN0IGZpbGUgKmZpbHAsIHN0cnVjdCBwYWdlICpsb2Nr ZWRfcGFnZSkKIAkJCWdvdG8gb3V0X3B1dDsKIAl9CiAKLQlyZXEtPnJfbXRpbWUgPSB0aW1lc3Bl YzY0X3RvX3RpbWVzcGVjKGlub2RlLT5pX210aW1lKTsKKwlyZXEtPnJfbXRpbWUgPSBpbm9kZS0+ aV9tdGltZTsKIAllcnIgPSBjZXBoX29zZGNfc3RhcnRfcmVxdWVzdCgmZnNjLT5jbGllbnQtPm9z ZGMsIHJlcSwgZmFsc2UpOwogCWlmICghZXJyKQogCQllcnIgPSBjZXBoX29zZGNfd2FpdF9yZXF1 ZXN0KCZmc2MtPmNsaWVudC0+b3NkYywgcmVxKTsKQEAgLTE5MzcsNyArMTkzNyw3IEBAIHN0YXRp YyBpbnQgX19jZXBoX3Bvb2xfcGVybV9nZXQoc3RydWN0IGNlcGhfaW5vZGVfaW5mbyAqY2ksCiAJ CQkJICAgICAwLCBmYWxzZSwgdHJ1ZSk7CiAJZXJyID0gY2VwaF9vc2RjX3N0YXJ0X3JlcXVlc3Qo JmZzYy0+Y2xpZW50LT5vc2RjLCByZF9yZXEsIGZhbHNlKTsKIAotCXdyX3JlcS0+cl9tdGltZSA9 IHRpbWVzcGVjNjRfdG9fdGltZXNwZWMoY2ktPnZmc19pbm9kZS5pX210aW1lKTsKKwl3cl9yZXEt PnJfbXRpbWUgPSBjaS0+dmZzX2lub2RlLmlfbXRpbWU7CiAJZXJyMiA9IGNlcGhfb3NkY19zdGFy dF9yZXF1ZXN0KCZmc2MtPmNsaWVudC0+b3NkYywgd3JfcmVxLCBmYWxzZSk7CiAKIAlpZiAoIWVy cikKZGlmZiAtLWdpdCBhL2ZzL2NlcGgvZmlsZS5jIGIvZnMvY2VwaC9maWxlLmMKaW5kZXggYWQw YmVkOTliMWQ1Li4xNzk1YThkYzlhMWUgMTAwNjQ0Ci0tLSBhL2ZzL2NlcGgvZmlsZS5jCisrKyBi L2ZzL2NlcGgvZmlsZS5jCkBAIC03MjEsNyArNzIxLDcgQEAgc3RydWN0IGNlcGhfYWlvX3JlcXVl c3QgewogCXN0cnVjdCBsaXN0X2hlYWQgb3NkX3JlcXM7CiAJdW5zaWduZWQgbnVtX3JlcXM7CiAJ YXRvbWljX3QgcGVuZGluZ19yZXFzOwotCXN0cnVjdCB0aW1lc3BlYyBtdGltZTsKKwlzdHJ1Y3Qg dGltZXNwZWM2NCBtdGltZTsKIAlzdHJ1Y3QgY2VwaF9jYXBfZmx1c2ggKnByZWFsbG9jX2NmOwog fTsKIApAQCAtOTIzLDcgKzkyMyw3IEBAIGNlcGhfZGlyZWN0X3JlYWRfd3JpdGUoc3RydWN0IGtp b2NiICppb2NiLCBzdHJ1Y3QgaW92X2l0ZXIgKml0ZXIsCiAJaW50IG51bV9wYWdlcyA9IDA7CiAJ aW50IGZsYWdzOwogCWludCByZXQ7Ci0Jc3RydWN0IHRpbWVzcGVjIG10aW1lID0gdGltZXNwZWM2 NF90b190aW1lc3BlYyhjdXJyZW50X3RpbWUoaW5vZGUpKTsKKwlzdHJ1Y3QgdGltZXNwZWM2NCBt dGltZSA9IGN1cnJlbnRfdGltZShpbm9kZSk7CiAJc2l6ZV90IGNvdW50ID0gaW92X2l0ZXJfY291 bnQoaXRlcik7CiAJbG9mZl90IHBvcyA9IGlvY2ItPmtpX3BvczsKIAlib29sIHdyaXRlID0gaW92 X2l0ZXJfcncoaXRlcikgPT0gV1JJVEU7CkBAIC0xMDEzLDcgKzEwMTMsNyBAQCBjZXBoX2RpcmVj dF9yZWFkX3dyaXRlKHN0cnVjdCBraW9jYiAqaW9jYiwgc3RydWN0IGlvdl9pdGVyICppdGVyLAog CQkJdHJ1bmNhdGVfaW5vZGVfcGFnZXNfcmFuZ2UoaW5vZGUtPmlfbWFwcGluZywgcG9zLAogCQkJ CQkocG9zK2xlbikgfCAoUEFHRV9TSVpFIC0gMSkpOwogCi0JCQlyZXEtPnJfbXRpbWUgPSBtdGlt ZTsKKwkJCXJlcS0+cl9tdGltZSA9IGN1cnJlbnRfdGltZShpbm9kZSk7CiAJCX0KIAogCQlvc2Rf cmVxX29wX2V4dGVudF9vc2RfZGF0YV9idmVjcyhyZXEsIDAsIGJ2ZWNzLCBudW1fcGFnZXMsIGxl bik7CkBAIC0xMTMxLDcgKzExMzEsNiBAQCBjZXBoX3N5bmNfd3JpdGUoc3RydWN0IGtpb2NiICpp b2NiLCBzdHJ1Y3QgaW92X2l0ZXIgKmZyb20sIGxvZmZfdCBwb3MsCiAJaW50IGZsYWdzOwogCWlu dCByZXQ7CiAJYm9vbCBjaGVja19jYXBzID0gZmFsc2U7Ci0Jc3RydWN0IHRpbWVzcGVjIG10aW1l ID0gdGltZXNwZWM2NF90b190aW1lc3BlYyhjdXJyZW50X3RpbWUoaW5vZGUpKTsKIAlzaXplX3Qg Y291bnQgPSBpb3ZfaXRlcl9jb3VudChmcm9tKTsKIAogCWlmIChjZXBoX3NuYXAoZmlsZV9pbm9k ZShmaWxlKSkgIT0gQ0VQSF9OT1NOQVApCkBAIC0xMjAxLDcgKzEyMDAsNyBAQCBjZXBoX3N5bmNf d3JpdGUoc3RydWN0IGtpb2NiICppb2NiLCBzdHJ1Y3QgaW92X2l0ZXIgKmZyb20sIGxvZmZfdCBw b3MsCiAJCW9zZF9yZXFfb3BfZXh0ZW50X29zZF9kYXRhX3BhZ2VzKHJlcSwgMCwgcGFnZXMsIGxl biwgMCwKIAkJCQkJCWZhbHNlLCB0cnVlKTsKIAotCQlyZXEtPnJfbXRpbWUgPSBtdGltZTsKKwkJ cmVxLT5yX210aW1lID0gY3VycmVudF90aW1lKGlub2RlKTsKIAkJcmV0ID0gY2VwaF9vc2RjX3N0 YXJ0X3JlcXVlc3QoJmZzYy0+Y2xpZW50LT5vc2RjLCByZXEsIGZhbHNlKTsKIAkJaWYgKCFyZXQp CiAJCQlyZXQgPSBjZXBoX29zZGNfd2FpdF9yZXF1ZXN0KCZmc2MtPmNsaWVudC0+b3NkYywgcmVx KTsKQEAgLTE2NjMsNyArMTY2Miw3IEBAIHN0YXRpYyBpbnQgY2VwaF96ZXJvX3BhcnRpYWxfb2Jq ZWN0KHN0cnVjdCBpbm9kZSAqaW5vZGUsCiAJCWdvdG8gb3V0OwogCX0KIAotCXJlcS0+cl9tdGlt ZSA9IHRpbWVzcGVjNjRfdG9fdGltZXNwZWMoaW5vZGUtPmlfbXRpbWUpOworCXJlcS0+cl9tdGlt ZSA9IGlub2RlLT5pX210aW1lOwogCXJldCA9IGNlcGhfb3NkY19zdGFydF9yZXF1ZXN0KCZmc2Mt PmNsaWVudC0+b3NkYywgcmVxLCBmYWxzZSk7CiAJaWYgKCFyZXQpIHsKIAkJcmV0ID0gY2VwaF9v c2RjX3dhaXRfcmVxdWVzdCgmZnNjLT5jbGllbnQtPm9zZGMsIHJlcSk7CmRpZmYgLS1naXQgYS9p bmNsdWRlL2xpbnV4L2NlcGgvb3NkX2NsaWVudC5oIGIvaW5jbHVkZS9saW51eC9jZXBoL29zZF9j bGllbnQuaAppbmRleCAwZDZlZTA0YjRjNDEuLjJlNjYxMWMxZTlhMCAxMDA2NDQKLS0tIGEvaW5j bHVkZS9saW51eC9jZXBoL29zZF9jbGllbnQuaAorKysgYi9pbmNsdWRlL2xpbnV4L2NlcGgvb3Nk X2NsaWVudC5oCkBAIC0xOTksNyArMTk5LDcgQEAgc3RydWN0IGNlcGhfb3NkX3JlcXVlc3Qgewog CS8qIHNldCBieSBzdWJtaXR0ZXIgKi8KIAl1NjQgcl9zbmFwaWQ7ICAgICAgICAgICAgICAgICAg ICAgICAgIC8qIGZvciByZWFkcywgQ0VQSF9OT1NOQVAgby93ICovCiAJc3RydWN0IGNlcGhfc25h cF9jb250ZXh0ICpyX3NuYXBjOyAgICAvKiBmb3Igd3JpdGVzICovCi0Jc3RydWN0IHRpbWVzcGVj IHJfbXRpbWU7ICAgICAgICAgICAgICAvKiBkaXR0byAqLworCXN0cnVjdCB0aW1lc3BlYzY0IHJf bXRpbWU7ICAgICAgICAgICAgLyogZGl0dG8gKi8KIAl1NjQgcl9kYXRhX29mZnNldDsgICAgICAg ICAgICAgICAgICAgIC8qIGRpdHRvICovCiAJYm9vbCByX2xpbmdlcjsgICAgICAgICAgICAgICAg ICAgICAgICAvKiBkb24ndCByZXNlbmQgb24gZmFpbHVyZSAqLwogCkBAIC0yNTMsNyArMjUzLDcg QEAgc3RydWN0IGNlcGhfb3NkX2xpbmdlcl9yZXF1ZXN0IHsKIAlzdHJ1Y3QgY2VwaF9vc2RfcmVx dWVzdF90YXJnZXQgdDsKIAl1MzIgbWFwX2RuZV9ib3VuZDsKIAotCXN0cnVjdCB0aW1lc3BlYyBt dGltZTsKKwlzdHJ1Y3QgdGltZXNwZWM2NCBtdGltZTsKIAogCXN0cnVjdCBrcmVmIGtyZWY7CiAJ c3RydWN0IG11dGV4IGxvY2s7CkBAIC01MDgsNyArNTA4LDcgQEAgZXh0ZXJuIGludCBjZXBoX29z ZGNfd3JpdGVwYWdlcyhzdHJ1Y3QgY2VwaF9vc2RfY2xpZW50ICpvc2RjLAogCQkJCXN0cnVjdCBj ZXBoX3NuYXBfY29udGV4dCAqc2MsCiAJCQkJdTY0IG9mZiwgdTY0IGxlbiwKIAkJCQl1MzIgdHJ1 bmNhdGVfc2VxLCB1NjQgdHJ1bmNhdGVfc2l6ZSwKLQkJCQlzdHJ1Y3QgdGltZXNwZWMgKm10aW1l LAorCQkJCXN0cnVjdCB0aW1lc3BlYzY0ICptdGltZSwKIAkJCQlzdHJ1Y3QgcGFnZSAqKnBhZ2Vz LCBpbnQgbnJfcGFnZXMpOwogCiAvKiB3YXRjaC9ub3RpZnkgKi8KZGlmZiAtLWdpdCBhL25ldC9j ZXBoL29zZF9jbGllbnQuYyBiL25ldC9jZXBoL29zZF9jbGllbnQuYwppbmRleCBhMDBjNzRmMTE1 NGUuLmE4N2EwMjFjYTlkMCAxMDA2NDQKLS0tIGEvbmV0L2NlcGgvb3NkX2NsaWVudC5jCisrKyBi L25ldC9jZXBoL29zZF9jbGllbnQuYwpAQCAtMTk3OCw3ICsxOTc4LDcgQEAgc3RhdGljIHZvaWQg ZW5jb2RlX3JlcXVlc3RfcGFydGlhbChzdHJ1Y3QgY2VwaF9vc2RfcmVxdWVzdCAqcmVxLAogCXAg Kz0gc2l6ZW9mKHN0cnVjdCBjZXBoX2Jsa2luX3RyYWNlX2luZm8pOwogCiAJY2VwaF9lbmNvZGVf MzIoJnAsIDApOyAvKiBjbGllbnRfaW5jLCBhbHdheXMgMCAqLwotCWNlcGhfZW5jb2RlX3RpbWVz cGVjKHAsICZyZXEtPnJfbXRpbWUpOworCWNlcGhfZW5jb2RlX3RpbWVzcGVjNjQocCwgJnJlcS0+ cl9tdGltZSk7CiAJcCArPSBzaXplb2Yoc3RydWN0IGNlcGhfdGltZXNwZWMpOwogCiAJZW5jb2Rl X29sb2MoJnAsIGVuZCwgJnJlcS0+cl90LnRhcmdldF9vbG9jKTsKQEAgLTQ1MTIsNyArNDUxMiw3 IEBAIGNlcGhfb3NkY193YXRjaChzdHJ1Y3QgY2VwaF9vc2RfY2xpZW50ICpvc2RjLAogCWNlcGhf b2lkX2NvcHkoJmxyZXEtPnQuYmFzZV9vaWQsIG9pZCk7CiAJY2VwaF9vbG9jX2NvcHkoJmxyZXEt PnQuYmFzZV9vbG9jLCBvbG9jKTsKIAlscmVxLT50LmZsYWdzID0gQ0VQSF9PU0RfRkxBR19XUklU RTsKLQlrdGltZV9nZXRfcmVhbF90cygmbHJlcS0+bXRpbWUpOworCWt0aW1lX2dldF9yZWFsX3Rz NjQoJmxyZXEtPm10aW1lKTsKIAogCWxyZXEtPnJlZ19yZXEgPSBhbGxvY19saW5nZXJfcmVxdWVz dChscmVxKTsKIAlpZiAoIWxyZXEtPnJlZ19yZXEpIHsKQEAgLTQ1NzAsNyArNDU3MCw3IEBAIGlu dCBjZXBoX29zZGNfdW53YXRjaChzdHJ1Y3QgY2VwaF9vc2RfY2xpZW50ICpvc2RjLAogCWNlcGhf b2lkX2NvcHkoJnJlcS0+cl9iYXNlX29pZCwgJmxyZXEtPnQuYmFzZV9vaWQpOwogCWNlcGhfb2xv Y19jb3B5KCZyZXEtPnJfYmFzZV9vbG9jLCAmbHJlcS0+dC5iYXNlX29sb2MpOwogCXJlcS0+cl9m bGFncyA9IENFUEhfT1NEX0ZMQUdfV1JJVEU7Ci0Ja3RpbWVfZ2V0X3JlYWxfdHMoJnJlcS0+cl9t dGltZSk7CisJa3RpbWVfZ2V0X3JlYWxfdHM2NCgmcmVxLT5yX210aW1lKTsKIAlvc2RfcmVxX29w X3dhdGNoX2luaXQocmVxLCAwLCBscmVxLT5saW5nZXJfaWQsCiAJCQkgICAgICBDRVBIX09TRF9X QVRDSF9PUF9VTldBVENIKTsKIApAQCAtNTEzNiw3ICs1MTM2LDcgQEAgaW50IGNlcGhfb3NkY193 cml0ZXBhZ2VzKHN0cnVjdCBjZXBoX29zZF9jbGllbnQgKm9zZGMsIHN0cnVjdCBjZXBoX3Zpbm8g dmlubywKIAkJCSBzdHJ1Y3QgY2VwaF9zbmFwX2NvbnRleHQgKnNuYXBjLAogCQkJIHU2NCBvZmYs IHU2NCBsZW4sCiAJCQkgdTMyIHRydW5jYXRlX3NlcSwgdTY0IHRydW5jYXRlX3NpemUsCi0JCQkg c3RydWN0IHRpbWVzcGVjICptdGltZSwKKwkJCSBzdHJ1Y3QgdGltZXNwZWM2NCAqbXRpbWUsCiAJ CQkgc3RydWN0IHBhZ2UgKipwYWdlcywgaW50IG51bV9wYWdlcykKIHsKIAlzdHJ1Y3QgY2VwaF9v c2RfcmVxdWVzdCAqcmVxOwotLSAKMi45LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fClkyMDM4IG1haWxpbmcgbGlzdApZMjAzOEBsaXN0cy5saW5hcm8u b3JnCmh0dHBzOi8vbGlzdHMubGluYXJvLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3kyMDM4Cg==