From: Jens Axboe <axboe@kernel.dk>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH] block: fix some more cmd_type cleanup fallout
Date: Sat, 19 Jun 2010 21:09:04 +0200 [thread overview]
Message-ID: <4C1D15D0.5070507@kernel.dk> (raw)
In-Reply-To: <20100619152647.GA18771@lst.de>
On 19/06/10 17.26, Christoph Hellwig wrote:
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> Index: linux-2.6/drivers/block/ub.c
> ===================================================================
> --- linux-2.6.orig/drivers/block/ub.c 2010-06-19 15:56:40.278273518 +0200
> +++ linux-2.6/drivers/block/ub.c 2010-06-19 16:04:02.104003996 +0200
> @@ -648,7 +648,7 @@ static int ub_request_fn_1(struct ub_lun
> return 0;
> }
>
> - if (lun->changed && rq->cmd_type != REQ_TYPE_BLOCK_PC)
> + if (lun->changed && rq->cmd_type != REQ_TYPE_BLOCK_PC) {
> blk_start_request(rq);
> ub_end_rq(rq, SAM_STAT_CHECK_CONDITION);
> return 0;
> Index: linux-2.6/drivers/ide/ide-atapi.c
> ===================================================================
> --- linux-2.6.orig/drivers/ide/ide-atapi.c 2010-06-19 15:56:40.285254311 +0200
> +++ linux-2.6/drivers/ide/ide-atapi.c 2010-06-19 16:04:02.104003996 +0200
> @@ -307,7 +307,7 @@ EXPORT_SYMBOL_GPL(ide_cd_expiry);
>
> int ide_cd_get_xferlen(struct request *rq)
> {
> - switch (rq->cmd_type)
> + switch (rq->cmd_type) {
> case REQ_TYPE_FS:
> return 32768;
> case REQ_TYPE_SENSE:
> @@ -477,12 +477,12 @@ static ide_startstop_t ide_pc_intr(ide_d
> if (uptodate == 0)
> drive->failed_pc = NULL;
>
> - if (rq->cmd_type == REQ_TYPE_SPECIAL)
> + if (rq->cmd_type == REQ_TYPE_SPECIAL) {
> rq->errors = 0;
> error = 0;
> } else {
>
> - if (req->cmd_type != REQ_TYPE_FS && uptodate <= 0) {
> + if (rq->cmd_type != REQ_TYPE_FS && uptodate <= 0) {
> if (rq->errors == 0)
> rq->errors = -EIO;
> }
> Index: linux-2.6/drivers/ide/ide-cd.c
> ===================================================================
> --- linux-2.6.orig/drivers/ide/ide-cd.c 2010-06-19 15:56:40.294262064 +0200
> +++ linux-2.6/drivers/ide/ide-cd.c 2010-06-19 16:04:02.109003717 +0200
> @@ -318,7 +318,7 @@ static int cdrom_decode_status(ide_drive
> cdrom_saw_media_change(drive);
>
> if (rq->cmd_type == REQ_TYPE_FS &&
> - !(rq->cmd_flags & REQ_QUIET)) {
> + !(rq->cmd_flags & REQ_QUIET))
> printk(KERN_ERR PFX "%s: tray open\n",
> drive->name);
> }
> @@ -375,7 +375,7 @@ static int cdrom_decode_status(ide_drive
> do_end_request = 1;
> break;
> default:
> - if (req->cmd_type != REQ_TYPE_FS)
> + if (rq->cmd_type != REQ_TYPE_FS)
> break;
> if (err & ~ATA_ABORTED) {
> /* go to the default handler for other errors */
> Index: linux-2.6/drivers/ide/ide-io.c
> ===================================================================
> --- linux-2.6.orig/drivers/ide/ide-io.c 2010-06-19 15:56:40.305025159 +0200
> +++ linux-2.6/drivers/ide/ide-io.c 2010-06-19 16:04:02.112003717 +0200
> @@ -353,7 +353,7 @@ static ide_startstop_t start_request (id
> pm->pm_step == IDE_PM_COMPLETED)
> ide_complete_pm_rq(drive, rq);
> return startstop;
> - } else if (!rq->rq_disk && rq->cmd_type == REQ_TYPE_SPECIAL) {
> + } else if (!rq->rq_disk && rq->cmd_type == REQ_TYPE_SPECIAL)
> /*
> * TODO: Once all ULDs have been modified to
> * check for specific op codes rather than
Thanks, my build missed those.
--
Jens Axboe
prev parent reply other threads:[~2010-06-19 19:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-19 15:26 [PATCH] block: fix some more cmd_type cleanup fallout Christoph Hellwig
2010-06-19 19:09 ` Jens Axboe [this message]
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=4C1D15D0.5070507@kernel.dk \
--to=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-fsdevel@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: link
Be 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.