| Message ID | 20170405180653.GA5548@kernel.dk (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, Apr 05, 2017 at 12:06:53PM -0600, Jens Axboe wrote: > On Wed, Apr 05 2017, Christoph Hellwig wrote: > > This series fixes a few lose bits in terms of how nvme uses ->retries, > > including fixing it for non-PCIe transports. While at it I noticed that > > nvme and scsi use the field in entirely different ways, and no other > > driver uses it at all. So I decided to move it into the nvme_request and > > scsi_request structures instead. > > > > Changes since V1: > > - better changelog for one patch > > - move the new retries field to the end of struct nvme_request > > Applied for 4.12. If we do the below on my box, we remove the (now) 2 > holes from struct request and shrink it 8 bytes. Looks good: Reviewed-by: Christoph Hellwig <hch@lst.de>
On 04/05/2017 12:16 PM, Christoph Hellwig wrote: > On Wed, Apr 05, 2017 at 12:06:53PM -0600, Jens Axboe wrote: >> On Wed, Apr 05 2017, Christoph Hellwig wrote: >>> This series fixes a few lose bits in terms of how nvme uses ->retries, >>> including fixing it for non-PCIe transports. While at it I noticed that >>> nvme and scsi use the field in entirely different ways, and no other >>> driver uses it at all. So I decided to move it into the nvme_request and >>> scsi_request structures instead. >>> >>> Changes since V1: >>> - better changelog for one patch >>> - move the new retries field to the end of struct nvme_request >> >> Applied for 4.12. If we do the below on my box, we remove the (now) 2 >> holes from struct request and shrink it 8 bytes. > > Looks good: > > Reviewed-by: Christoph Hellwig <hch@lst.de> Thanks, added that too.
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ce6f9a6534c9..3cf241b0814d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -215,6 +215,8 @@ struct request { unsigned short ioprio; + unsigned int timeout; + void *special; /* opaque pointer available for LLD use */ int errors; @@ -223,7 +225,6 @@ struct request { unsigned long deadline; struct list_head timeout_list; - unsigned int timeout; /* * completion callback.