From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hannes Reinecke Subject: Re: [RESEND PATCH v3] scsi: stex: Remove use of struct timeval Date: Fri, 30 Oct 2015 12:58:33 +0100 Message-ID: <56335B69.4010502@suse.de> References: <20151030083040.GA31741@tina-laptop> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20151030083040.GA31741@tina-laptop> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" To: Tina Ruchandani , linux-scsi@vger.kernel.org, arnd@arndb.de Cc: y2038@lists.linaro.org, "James E.J. Bottomley" , linux-kernel@vger.kernel.org List-Id: linux-scsi@vger.kernel.org T24gMTAvMzAvMjAxNSAwOTozMCBBTSwgVGluYSBSdWNoYW5kYW5pIHdyb3RlOgo+IEZ1bmN0aW9u IHN0ZXhfZ2V0dGltZSB1c2VzICdzdHJ1Y3QgdGltZXZhbCcgd2hvc2UgdHZfc2VjIHZhbHVlCj4g d2lsbCBvdmVyZmxvdyBvbiAzMi1iaXQgc3lzdGVtcyBpbiB5ZWFyIDIwMzggYW5kIGJleW9uZC4g VGhpcyBwYXRjaAo+IHJlcGxhY2VzIHRoZSB1c2Ugb2Ygc3RydWN0IHRpbWV2YWwgYW5kIGRvX2dl dHRpbWVvZmRheSB3aXRoCj4ga3RpbWVfZ2V0X3JlYWxfc2Vjb25kcywgd2hpY2ggcmV0dXJucyBh IDY0LWJpdCBzZWNvbmRzIHZhbHVlLgo+IAo+IFN1Z2dlc3RlZC1ieTogQXJuZCBCZXJnbWFubiA8 YXJuZEBhcm5kYi5kZT4KPiBTaWduZWQtb2ZmLWJ5OiBUaW5hIFJ1Y2hhbmRhbmkgPHJ1Y2hhbmRh bmkudGluYUBnbWFpbC5jb20+Cj4gLS0KPiBDaGFuZ2VzIGluIHYzOgo+IC0gUmVtb3ZlIHN0ZXhf Z2V0dGltZSBhbHRvZ2V0aGVyLCBkaXJlY3RseSBhc3NpZ24gdGhlIHRpbWVzdGFtcC4KPiBDaGFu Z2VzIGluIHYyOgo+IC0gQ2hhbmdlIHN1YmplY3QgbGluZSB0byBpbmRpY2F0ZSB0aGF0IHRoZSBw YXRjaCBpcyByZXN0cmljdGVkIHRvIHN0ZXggZHJpdmVyLgo+IC0tLQo+IC0tLQo+ICBkcml2ZXJz L3Njc2kvc3RleC5jIHwgMTMgKysrLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMyBpbnNl cnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9zY3Np L3N0ZXguYyBiL2RyaXZlcnMvc2NzaS9zdGV4LmMKPiBpbmRleCA5OGE2MmJjLi44NGUxOTZlIDEw MDY0NAo+IC0tLSBhL2RyaXZlcnMvc2NzaS9zdGV4LmMKPiArKysgYi9kcml2ZXJzL3Njc2kvc3Rl eC5jCj4gQEAgLTI1LDYgKzI1LDcgQEAKPiAgI2luY2x1ZGUgPGxpbnV4L3R5cGVzLmg+Cj4gICNp bmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KPiAgI2luY2x1ZGUgPGxpbnV4L3NwaW5sb2NrLmg+Cj4g KyNpbmNsdWRlIDxsaW51eC9rdGltZS5oPgo+ICAjaW5jbHVkZSA8YXNtL2lvLmg+Cj4gICNpbmNs dWRlIDxhc20vaXJxLmg+Cj4gICNpbmNsdWRlIDxhc20vYnl0ZW9yZGVyLmg+Cj4gQEAgLTM2Miwx NCArMzYzLDYgQEAgTU9EVUxFX0RFU0NSSVBUSU9OKCJQcm9taXNlIFRlY2hub2xvZ3kgU3VwZXJU cmFrIEVYIENvbnRyb2xsZXJzIik7Cj4gIE1PRFVMRV9MSUNFTlNFKCJHUEwiKTsKPiAgTU9EVUxF X1ZFUlNJT04oU1RfRFJJVkVSX1ZFUlNJT04pOwo+ICAKPiAtc3RhdGljIHZvaWQgc3RleF9nZXR0 aW1lKF9fbGU2NCAqdGltZSkKPiAtewo+IC0Jc3RydWN0IHRpbWV2YWwgdHY7Cj4gLQo+IC0JZG9f Z2V0dGltZW9mZGF5KCZ0dik7Cj4gLQkqdGltZSA9IGNwdV90b19sZTY0KHR2LnR2X3NlYyk7Cj4g LX0KPiAtCj4gIHN0YXRpYyBzdHJ1Y3Qgc3RhdHVzX21zZyAqc3RleF9nZXRfc3RhdHVzKHN0cnVj dCBzdF9oYmEgKmhiYSkKPiAgewo+ICAJc3RydWN0IHN0YXR1c19tc2cgKnN0YXR1cyA9IGhiYS0+ c3RhdHVzX2J1ZmZlciArIGhiYS0+c3RhdHVzX3RhaWw7Cj4gQEAgLTEwMDIsNyArOTk1LDcgQEAg c3RhdGljIGludCBzdGV4X2NvbW1vbl9oYW5kc2hha2Uoc3RydWN0IHN0X2hiYSAqaGJhKQo+ICAJ aC0+cmVxX2NudCA9IGNwdV90b19sZTE2KGhiYS0+cnFfY291bnQrMSk7Cj4gIAloLT5zdGF0dXNf c3ogPSBjcHVfdG9fbGUxNihzaXplb2Yoc3RydWN0IHN0YXR1c19tc2cpKTsKPiAgCWgtPnN0YXR1 c19jbnQgPSBjcHVfdG9fbGUxNihoYmEtPnN0c19jb3VudCsxKTsKPiAtCXN0ZXhfZ2V0dGltZSgm aC0+aG9zdHRpbWUpOwo+ICsJaC0+aG9zdHRpbWUgPSBjcHVfdG9fbGU2NChrdGltZV9nZXRfcmVh bF9zZWNvbmRzKCkpOwo+ICAJaC0+cGFydG5lcl90eXBlID0gSE1VX1BBUlRORVJfVFlQRTsKPiAg CWlmIChoYmEtPmV4dHJhX29mZnNldCkgewo+ICAJCWgtPmV4dHJhX29mZnNldCA9IGNwdV90b19s ZTMyKGhiYS0+ZXh0cmFfb2Zmc2V0KTsKPiBAQCAtMTA3Niw3ICsxMDY5LDcgQEAgc3RhdGljIGlu dCBzdGV4X3NzX2hhbmRzaGFrZShzdHJ1Y3Qgc3RfaGJhICpoYmEpCj4gIAloLT5yZXFfY250ID0g Y3B1X3RvX2xlMTYoaGJhLT5ycV9jb3VudCsxKTsKPiAgCWgtPnN0YXR1c19zeiA9IGNwdV90b19s ZTE2KHNpemVvZihzdHJ1Y3Qgc3RhdHVzX21zZykpOwo+ICAJaC0+c3RhdHVzX2NudCA9IGNwdV90 b19sZTE2KGhiYS0+c3RzX2NvdW50KzEpOwo+IC0Jc3RleF9nZXR0aW1lKCZoLT5ob3N0dGltZSk7 Cj4gKwloLT5ob3N0dGltZSA9IGNwdV90b19sZTY0KGt0aW1lX2dldF9yZWFsX3NlY29uZHMoKSk7 Cj4gIAloLT5wYXJ0bmVyX3R5cGUgPSBITVVfUEFSVE5FUl9UWVBFOwo+ICAJaC0+ZXh0cmFfb2Zm c2V0ID0gaC0+ZXh0cmFfc2l6ZSA9IDA7Cj4gIAlzY3JhdGNoX3NpemUgPSAoaGJhLT5zdHNfY291 bnQrMSkqc2l6ZW9mKHUzMik7Cj4gCkp1c3QgcmVtb3ZlICdob3N0dGltZScgYWx0b2dldGhlci4g SXQgc2VydmVzIG5vIHB1cnBvc2Ugd2hhdHNvZXZlci4KCkNoZWVycywKCkhhbm5lcwotLSAKRHIu IEhhbm5lcyBSZWluZWNrZQkJICAgICAgelNlcmllcyAmIFN0b3JhZ2UKaGFyZUBzdXNlLmRlCQkJ ICAgICAgKzQ5IDkxMSA3NDA1MyA2ODgKU1VTRSBMSU5VWCBQcm9kdWN0cyBHbWJILCBNYXhmZWxk c3RyLiA1LCA5MDQwOSBOw7xybmJlcmcKR0Y6IEouIEhhd24sIEouIEd1aWxkLCBGLiBJbWVuZMO2 cmZmZXIsIEhSQiAxNjc0NiAoQUcgTsO8cm5iZXJnKQpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpZMjAzOCBtYWlsaW5nIGxpc3QKWTIwMzhAbGlzdHMubGlu YXJvLm9yZwpodHRwczovL2xpc3RzLmxpbmFyby5vcmcvbWFpbG1hbi9saXN0aW5mby95MjAzOAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030993AbbJ3L6h (ORCPT ); Fri, 30 Oct 2015 07:58:37 -0400 Received: from mx2.suse.de ([195.135.220.15]:55891 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030727AbbJ3L6g (ORCPT ); Fri, 30 Oct 2015 07:58:36 -0400 Subject: Re: [RESEND PATCH v3] scsi: stex: Remove use of struct timeval To: Tina Ruchandani , linux-scsi@vger.kernel.org, arnd@arndb.de References: <20151030083040.GA31741@tina-laptop> Cc: "James E.J. Bottomley" , y2038@lists.linaro.org, linux-kernel@vger.kernel.org From: Hannes Reinecke Message-ID: <56335B69.4010502@suse.de> Date: Fri, 30 Oct 2015 12:58:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20151030083040.GA31741@tina-laptop> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/30/2015 09:30 AM, Tina Ruchandani wrote: > Function stex_gettime uses 'struct timeval' whose tv_sec value > will overflow on 32-bit systems in year 2038 and beyond. This patch > replaces the use of struct timeval and do_gettimeofday with > ktime_get_real_seconds, which returns a 64-bit seconds value. > > Suggested-by: Arnd Bergmann > Signed-off-by: Tina Ruchandani > -- > Changes in v3: > - Remove stex_gettime altogether, directly assign the timestamp. > Changes in v2: > - Change subject line to indicate that the patch is restricted to stex driver. > --- > --- > drivers/scsi/stex.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c > index 98a62bc..84e196e 100644 > --- a/drivers/scsi/stex.c > +++ b/drivers/scsi/stex.c > @@ -25,6 +25,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -362,14 +363,6 @@ MODULE_DESCRIPTION("Promise Technology SuperTrak EX Controllers"); > MODULE_LICENSE("GPL"); > MODULE_VERSION(ST_DRIVER_VERSION); > > -static void stex_gettime(__le64 *time) > -{ > - struct timeval tv; > - > - do_gettimeofday(&tv); > - *time = cpu_to_le64(tv.tv_sec); > -} > - > static struct status_msg *stex_get_status(struct st_hba *hba) > { > struct status_msg *status = hba->status_buffer + hba->status_tail; > @@ -1002,7 +995,7 @@ static int stex_common_handshake(struct st_hba *hba) > h->req_cnt = cpu_to_le16(hba->rq_count+1); > h->status_sz = cpu_to_le16(sizeof(struct status_msg)); > h->status_cnt = cpu_to_le16(hba->sts_count+1); > - stex_gettime(&h->hosttime); > + h->hosttime = cpu_to_le64(ktime_get_real_seconds()); > h->partner_type = HMU_PARTNER_TYPE; > if (hba->extra_offset) { > h->extra_offset = cpu_to_le32(hba->extra_offset); > @@ -1076,7 +1069,7 @@ static int stex_ss_handshake(struct st_hba *hba) > h->req_cnt = cpu_to_le16(hba->rq_count+1); > h->status_sz = cpu_to_le16(sizeof(struct status_msg)); > h->status_cnt = cpu_to_le16(hba->sts_count+1); > - stex_gettime(&h->hosttime); > + h->hosttime = cpu_to_le64(ktime_get_real_seconds()); > h->partner_type = HMU_PARTNER_TYPE; > h->extra_offset = h->extra_size = 0; > scratch_size = (hba->sts_count+1)*sizeof(u32); > Just remove 'hosttime' altogether. It serves no purpose whatsoever. Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)