| Message ID | 20180618153004.1808419-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | fe7f4e5d11541402f54ebd777a4f49caee891401 |
| Headers | show |
| Series | scsi_transport_fc: use 64-bit timestamps consistently | expand |
Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
On 6/18/2018 8:29 AM, Arnd Bergmann wrote: > The get_seconds() helper returns an 'unsigned long' value, which can > overflow on 32-bit architectures. Since the interface we pass it into > already uses a 64-bit type, we can just use ktime_get_real_seconds() > instead. > > While we generally prefer local timestamps in CLOCK_MONOTONIC format > (ktime_get_seconds), this keeps using the CLOCK_REALTIME version > in order to maintain compatibility with existing code. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/scsi/scsi_transport_fc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c > index 1da3d71e9f61..bb6de88aa724 100644 > --- a/drivers/scsi/scsi_transport_fc.c > +++ b/drivers/scsi/scsi_transport_fc.c > @@ -567,7 +567,7 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number, > > INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC, > FC_NL_ASYNC_EVENT, len); > - event->seconds = get_seconds(); > + event->seconds = ktime_get_real_seconds(); > event->vendor_id = 0; > event->host_no = shost->host_no; > event->event_datalen = sizeof(u32); /* bytes */ > @@ -635,7 +635,7 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number, > > INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC, > FC_NL_ASYNC_EVENT, len); > - event->seconds = get_seconds(); > + event->seconds = ktime_get_real_seconds(); > event->vendor_id = vendor_id; > event->host_no = shost->host_no; > event->event_datalen = data_len; /* bytes */ > looks good Reviewed-by: James Smart <james.smart@broadcom.com>
Arnd, > The get_seconds() helper returns an 'unsigned long' value, which can > overflow on 32-bit architectures. Since the interface we pass it into > already uses a 64-bit type, we can just use ktime_get_real_seconds() > instead. > > While we generally prefer local timestamps in CLOCK_MONOTONIC format > (ktime_get_seconds), this keeps using the CLOCK_REALTIME version in > order to maintain compatibility with existing code. Applied to 4.19/scsi-queue, thanks! -- Martin K. Petersen Oracle Linux Engineering
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 1da3d71e9f61..bb6de88aa724 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -567,7 +567,7 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number, INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC, FC_NL_ASYNC_EVENT, len); - event->seconds = get_seconds(); + event->seconds = ktime_get_real_seconds(); event->vendor_id = 0; event->host_no = shost->host_no; event->event_datalen = sizeof(u32); /* bytes */ @@ -635,7 +635,7 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number, INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC, FC_NL_ASYNC_EVENT, len); - event->seconds = get_seconds(); + event->seconds = ktime_get_real_seconds(); event->vendor_id = vendor_id; event->host_no = shost->host_no; event->event_datalen = data_len; /* bytes */
The get_seconds() helper returns an 'unsigned long' value, which can overflow on 32-bit architectures. Since the interface we pass it into already uses a 64-bit type, we can just use ktime_get_real_seconds() instead. While we generally prefer local timestamps in CLOCK_MONOTONIC format (ktime_get_seconds), this keeps using the CLOCK_REALTIME version in order to maintain compatibility with existing code. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/scsi/scsi_transport_fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0