From: Tejun Heo <htejun@gmail.com> To: axboe@kernel.dk, linux-kernel@vger.kernel.org, jeff@garzik.org, linux-ide@vger.kernel.org, James.Bottomley@HansenPartnership.com, linux-scsi@vger.kernel.org, bzolnier@gmail.com, petko Subject: Re: [GIT PATCH] block,scsi,ide: unify sector and data_len, take#2 Date: Thu, 07 May 2009 11:48:11 +0900 [thread overview] Message-ID: <4A024BEB.305@gmail.com> (raw) In-Reply-To: <49FFB9BE.1090709@gmail.com> Tejun Heo wrote: > Hello, > > Tejun Heo wrote: >> Upon ack, please pull from the following git tree. >> >> git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git block-unify-sector-and-data_len > > git tree has been updated as per comments. > > * Acked-by:'s added. > > * Too early blk_rq_bytes() conversion in ide-tape pushed to later > patch. > > Both changes are minor and don't make any difference to the final > result. The new commit is f7ff5f0d7cda0b0da5e7de36dd97ff75412bbe16. Tree updated again. Changes are... * I forgot to convert new drivers (mg_disk and swim) to accessors. 0005-block-convert-to-pos-and-nr_sectors-accessors.patch updated to convert these new drivers. * Acked-by added. The new commit is 1df2a196e28cc8f97919dc530dc1c019e1d3a968. diff f7ff5f0d..1df2a196 follows. The conversions are straight forward. drivers/block/mg_disk.c | 25 +++++++++++++------------ drivers/block/swim.c | 6 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index 71e56cc..826c349 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c @@ -220,7 +220,8 @@ static void mg_dump_status(const char *msg, unsigned int stat, if (host->breq) { req = elv_next_request(host->breq); if (req) - printk(", sector=%u", (u32)req->sector); + printk(", sector=%u", + (unsigned int)blk_rq_pos(req)); } } @@ -493,12 +494,12 @@ static void mg_read(struct request *req) u32 j; struct mg_host *host = req->rq_disk->private_data; - if (mg_out(host, req->sector, req->nr_sectors, MG_CMD_RD, NULL) != - MG_ERR_NONE) + if (mg_out(host, blk_rq_pos(req), blk_rq_sectors(req), + MG_CMD_RD, NULL) != MG_ERR_NONE) mg_bad_rw_intr(host); MG_DBG("requested %d sects (from %ld), buffer=0x%p\n", - req->nr_sectors, req->sector, req->buffer); + blk_rq_sectors(req), blk_rq_pos(req), req->buffer); do { u16 *buff = (u16 *)req->buffer; @@ -522,14 +523,14 @@ static void mg_write(struct request *req) u32 j; struct mg_host *host = req->rq_disk->private_data; - if (mg_out(host, req->sector, req->nr_sectors, MG_CMD_WR, NULL) != - MG_ERR_NONE) { + if (mg_out(host, blk_rq_pos(req), blk_rq_sectors(req), + MG_CMD_WR, NULL) != MG_ERR_NONE) { mg_bad_rw_intr(host); return; } MG_DBG("requested %d sects (from %ld), buffer=0x%p\n", - req->nr_sectors, req->sector, req->buffer); + blk_rq_sectors(req), blk_rq_pos(req), req->buffer); do { u16 *buff = (u16 *)req->buffer; @@ -579,7 +580,7 @@ ok_to_read: (i << 1)); MG_DBG("sector %ld, remaining=%ld, buffer=0x%p\n", - req->sector, req->nr_sectors - 1, req->buffer); + blk_rq_pos(req), blk_rq_sectors(req) - 1, req->buffer); /* send read confirm */ outb(MG_CMD_RD_CONF, (unsigned long)host->dev_base + MG_REG_COMMAND); @@ -609,7 +610,7 @@ static void mg_write_intr(struct mg_host *host) break; if (!MG_READY_OK(i)) break; - if ((req->nr_sectors <= 1) || (i & ATA_DRQ)) + if ((blk_rq_sectors(req) <= 1) || (i & ATA_DRQ)) goto ok_to_write; } while (0); mg_dump_status("mg_write_intr", i, host); @@ -627,7 +628,7 @@ ok_to_write: buff++; } MG_DBG("sector %ld, remaining=%ld, buffer=0x%p\n", - req->sector, req->nr_sectors, req->buffer); + blk_rq_pos(req), blk_rq_sectors(req), req->buffer); host->mg_do_intr = mg_write_intr; mod_timer(&host->timer, jiffies + 3 * HZ); } @@ -749,9 +750,9 @@ static void mg_request(struct request_queue *q) del_timer(&host->timer); - sect_num = req->sector; + sect_num = blk_rq_pos(req); /* deal whole segments */ - sect_cnt = req->nr_sectors; + sect_cnt = blk_rq_sectors(req); /* sanity check */ if (sect_num >= get_capacity(req->rq_disk) || diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 97ef426..fc6a1c3 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -531,7 +531,7 @@ static void redo_fd_request(struct request_queue *q) while ((req = elv_next_request(q))) { fs = req->rq_disk->private_data; - if (req->sector < 0 || req->sector >= fs->total_secs) { + if (blk_rq_pos(req) >= fs->total_secs) { __blk_end_request_cur(req, -EIO); continue; } @@ -551,8 +551,8 @@ static void redo_fd_request(struct request_queue *q) __blk_end_request_cur(req, -EIO); break; case READ: - if (floppy_read_sectors(fs, req->sector, - req->current_nr_sectors, + if (floppy_read_sectors(fs, blk_rq_pos(req), + blk_rq_cur_sectors(req), req->buffer)) { __blk_end_request_cur(req, -EIO); continue; -- tejun
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <htejun@gmail.com> To: axboe@kernel.dk, linux-kernel@vger.kernel.org, jeff@garzik.org, linux-ide@vger.kernel.org, James.Bottomley@HansenPartnership.com, linux-scsi@vger.kernel.org, bzolnier@gmail.com, petkovbb@googlemail.com, sshtylyov@ru.mvista.com, mike.miller@hp.com, Eric.Moore@lsi.com, stern@rowland.harvard.edu, fujita.tomonori@lab.ntt.co.jp, zaitcev@redhat.com, Geert.Uytterhoeven@sonycom.com, sfr@canb.auug.org.au, grant.likely@secretlab.ca, paul.clements@steeleye.com, tim@cyberelk.net, jeremy@xensource.com, adrian@mcmen.demon.co.uk, oakad@yahoo.com, dwmw2@infradead.org, schwidefsky@de.ibm.com, ballabio_dario@emc.com, davem@davemloft.net, rusty@rustcorp.com.au, Markus.Lidel@shadowconnect.com, bharrosh@panasas.com Subject: Re: [GIT PATCH] block,scsi,ide: unify sector and data_len, take#2 Date: Thu, 07 May 2009 11:48:11 +0900 [thread overview] Message-ID: <4A024BEB.305@gmail.com> (raw) In-Reply-To: <49FFB9BE.1090709@gmail.com> Tejun Heo wrote: > Hello, > > Tejun Heo wrote: >> Upon ack, please pull from the following git tree. >> >> git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git block-unify-sector-and-data_len > > git tree has been updated as per comments. > > * Acked-by:'s added. > > * Too early blk_rq_bytes() conversion in ide-tape pushed to later > patch. > > Both changes are minor and don't make any difference to the final > result. The new commit is f7ff5f0d7cda0b0da5e7de36dd97ff75412bbe16. Tree updated again. Changes are... * I forgot to convert new drivers (mg_disk and swim) to accessors. 0005-block-convert-to-pos-and-nr_sectors-accessors.patch updated to convert these new drivers. * Acked-by added. The new commit is 1df2a196e28cc8f97919dc530dc1c019e1d3a968. diff f7ff5f0d..1df2a196 follows. The conversions are straight forward. drivers/block/mg_disk.c | 25 +++++++++++++------------ drivers/block/swim.c | 6 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index 71e56cc..826c349 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c @@ -220,7 +220,8 @@ static void mg_dump_status(const char *msg, unsigned int stat, if (host->breq) { req = elv_next_request(host->breq); if (req) - printk(", sector=%u", (u32)req->sector); + printk(", sector=%u", + (unsigned int)blk_rq_pos(req)); } } @@ -493,12 +494,12 @@ static void mg_read(struct request *req) u32 j; struct mg_host *host = req->rq_disk->private_data; - if (mg_out(host, req->sector, req->nr_sectors, MG_CMD_RD, NULL) != - MG_ERR_NONE) + if (mg_out(host, blk_rq_pos(req), blk_rq_sectors(req), + MG_CMD_RD, NULL) != MG_ERR_NONE) mg_bad_rw_intr(host); MG_DBG("requested %d sects (from %ld), buffer=0x%p\n", - req->nr_sectors, req->sector, req->buffer); + blk_rq_sectors(req), blk_rq_pos(req), req->buffer); do { u16 *buff = (u16 *)req->buffer; @@ -522,14 +523,14 @@ static void mg_write(struct request *req) u32 j; struct mg_host *host = req->rq_disk->private_data; - if (mg_out(host, req->sector, req->nr_sectors, MG_CMD_WR, NULL) != - MG_ERR_NONE) { + if (mg_out(host, blk_rq_pos(req), blk_rq_sectors(req), + MG_CMD_WR, NULL) != MG_ERR_NONE) { mg_bad_rw_intr(host); return; } MG_DBG("requested %d sects (from %ld), buffer=0x%p\n", - req->nr_sectors, req->sector, req->buffer); + blk_rq_sectors(req), blk_rq_pos(req), req->buffer); do { u16 *buff = (u16 *)req->buffer; @@ -579,7 +580,7 @@ ok_to_read: (i << 1)); MG_DBG("sector %ld, remaining=%ld, buffer=0x%p\n", - req->sector, req->nr_sectors - 1, req->buffer); + blk_rq_pos(req), blk_rq_sectors(req) - 1, req->buffer); /* send read confirm */ outb(MG_CMD_RD_CONF, (unsigned long)host->dev_base + MG_REG_COMMAND); @@ -609,7 +610,7 @@ static void mg_write_intr(struct mg_host *host) break; if (!MG_READY_OK(i)) break; - if ((req->nr_sectors <= 1) || (i & ATA_DRQ)) + if ((blk_rq_sectors(req) <= 1) || (i & ATA_DRQ)) goto ok_to_write; } while (0); mg_dump_status("mg_write_intr", i, host); @@ -627,7 +628,7 @@ ok_to_write: buff++; } MG_DBG("sector %ld, remaining=%ld, buffer=0x%p\n", - req->sector, req->nr_sectors, req->buffer); + blk_rq_pos(req), blk_rq_sectors(req), req->buffer); host->mg_do_intr = mg_write_intr; mod_timer(&host->timer, jiffies + 3 * HZ); } @@ -749,9 +750,9 @@ static void mg_request(struct request_queue *q) del_timer(&host->timer); - sect_num = req->sector; + sect_num = blk_rq_pos(req); /* deal whole segments */ - sect_cnt = req->nr_sectors; + sect_cnt = blk_rq_sectors(req); /* sanity check */ if (sect_num >= get_capacity(req->rq_disk) || diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 97ef426..fc6a1c3 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -531,7 +531,7 @@ static void redo_fd_request(struct request_queue *q) while ((req = elv_next_request(q))) { fs = req->rq_disk->private_data; - if (req->sector < 0 || req->sector >= fs->total_secs) { + if (blk_rq_pos(req) >= fs->total_secs) { __blk_end_request_cur(req, -EIO); continue; } @@ -551,8 +551,8 @@ static void redo_fd_request(struct request_queue *q) __blk_end_request_cur(req, -EIO); break; case READ: - if (floppy_read_sectors(fs, req->sector, - req->current_nr_sectors, + if (floppy_read_sectors(fs, blk_rq_pos(req), + blk_rq_cur_sectors(req), req->buffer)) { __blk_end_request_cur(req, -EIO); continue; -- tejun
next prev parent reply other threads:[~2009-05-07 2:48 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-05-04 7:58 [GIT PATCH] block,scsi,ide: unify sector and data_len, take#2 Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 7:58 ` [PATCH 01/11] nbd: don't clear rq->sector and nr_sectors unnecessarily Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 7:58 ` [PATCH 02/11] ide-tape: don't initialize rq->sector for rw requests Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 7:58 ` [PATCH 03/11] block: add rq->resid_len Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 12:08 ` Sergei Shtylyov 2009-05-05 3:41 ` Tejun Heo 2009-05-07 10:23 ` FUJITA Tomonori 2009-05-10 14:07 ` Boaz Harrosh 2009-05-10 23:48 ` Tejun Heo 2009-05-11 5:49 ` FUJITA Tomonori 2009-05-11 14:18 ` James Bottomley 2009-05-11 15:03 ` FUJITA Tomonori 2009-05-11 15:13 ` James Bottomley 2009-05-11 23:47 ` FUJITA Tomonori 2009-05-12 0:19 ` Tejun Heo 2009-05-12 3:43 ` James Bottomley 2009-05-12 6:04 ` Tejun Heo 2009-05-12 14:08 ` James Bottomley 2009-05-12 14:34 ` Alan Stern 2009-05-12 14:34 ` Alan Stern 2009-05-12 15:17 ` Tejun Heo 2009-05-12 15:45 ` James Bottomley 2009-05-13 6:30 ` Tejun Heo 2009-05-11 11:31 ` Boaz Harrosh 2009-05-11 14:59 ` FUJITA Tomonori 2009-05-12 8:58 ` Boaz Harrosh 2009-05-12 15:00 ` FUJITA Tomonori 2009-05-12 15:08 ` Boaz Harrosh 2009-05-12 15:16 ` FUJITA Tomonori 2009-05-12 0:27 ` Tejun Heo 2009-05-12 8:46 ` Boaz Harrosh 2009-05-12 9:07 ` Tejun Heo 2009-05-12 9:10 ` Tejun Heo 2009-05-12 9:52 ` Boaz Harrosh 2009-05-12 10:06 ` Tejun Heo 2009-05-12 11:08 ` Boaz Harrosh 2009-05-12 15:20 ` Tejun Heo 2009-05-12 15:53 ` Boaz Harrosh 2009-05-04 7:58 ` [PATCH 04/11] block: implement blk_rq_pos/[cur_]sectors() and convert obvious ones Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 13:45 ` Sergei Shtylyov 2009-05-05 3:42 ` Tejun Heo 2009-05-04 7:58 ` [PATCH 05/11] block: convert to pos and nr_sectors accessors Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 19:48 ` Adrian McMenamin 2009-05-05 3:42 ` Tejun Heo 2009-05-04 7:58 ` [PATCH 06/11] ide: convert to rq " Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 7:58 ` [PATCH 07/11] block: drop request->hard_* and *nr_sectors Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 7:58 ` [PATCH 08/11] block: cleanup rq->data_len usages Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 14:41 ` Sergei Shtylyov 2009-05-11 12:02 ` Boaz Harrosh 2009-05-04 7:58 ` [PATCH 09/11] ide: " Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 7:58 ` [PATCH 10/11] block: hide request sector and data_len Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-04 7:58 ` [PATCH 11/11] block: blk_rq_[cur_]_{sectors|bytes}() usage cleanup Tejun Heo 2009-05-04 7:58 ` Tejun Heo 2009-05-05 3:59 ` [GIT PATCH] block,scsi,ide: unify sector and data_len, take#2 Tejun Heo 2009-05-05 3:59 ` Tejun Heo 2009-05-07 2:48 ` Tejun Heo [this message] 2009-05-07 2:48 ` Tejun Heo 2009-05-07 10:23 ` FUJITA Tomonori 2009-05-08 2:06 ` FUJITA Tomonori 2009-05-08 9:11 ` Tejun Heo 2009-05-11 12:06 ` Boaz Harrosh 2009-05-12 0:49 ` Tejun Heo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4A024BEB.305@gmail.com \ --to=htejun@gmail.com \ --cc=James.Bottomley@HansenPartnership.com \ --cc=axboe@kernel.dk \ --cc=bzolnier@gmail.com \ --cc=jeff@garzik.org \ --cc=linux-ide@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.