From: Jean Delvare <khali@linux-fr.org>
To: Chris Wright <chrisw@sous-sol.org>
Cc: linux-kernel@vger.kernel.org, stable@kernel.org,
Linus Torvalds <torvalds@osdl.org>
Subject: Re: Linux 2.6.15.4
Date: Fri, 10 Feb 2006 19:23:24 +0100 [thread overview]
Message-ID: <20060210192324.0af51931.khali@linux-fr.org> (raw)
In-Reply-To: <20060210081720.GG30803@sorel.sous-sol.org>
Hi Chris, all,
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -1534,11 +1534,6 @@ struct request_queue *scsi_alloc_queue(s
> */
> if (shost->ordered_tag)
> blk_queue_ordered(q, QUEUE_ORDERED_TAG);
> - else if (shost->ordered_flush) {
> - blk_queue_ordered(q, QUEUE_ORDERED_FLUSH);
> - q->prepare_flush_fn = scsi_prepare_flush_fn;
> - q->end_flush_fn = scsi_end_flush_fn;
> - }
>
> if (!shost->use_clustering)
> clear_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
This change causes the following warnings:
drivers/scsi/scsi_lib.c:1035: warning: `scsi_prepare_flush_fn' defined but not used
drivers/scsi/scsi_lib.c:1050: warning: `scsi_end_flush_fn' defined but not used
Following patch fixes this.
Thanks.
* * * * *
Fix the following warnings introduced by stable patch 2.6.15.4:
drivers/scsi/scsi_lib.c:1035: warning: `scsi_prepare_flush_fn' defined but not used
drivers/scsi/scsi_lib.c:1050: warning: `scsi_end_flush_fn' defined but not used
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
drivers/scsi/scsi_lib.c | 32 --------------------------------
1 file changed, 32 deletions(-)
--- linux-2.6.15.4.orig/drivers/scsi/scsi_lib.c 2006-02-10 18:50:46.000000000 +0100
+++ linux-2.6.15.4/drivers/scsi/scsi_lib.c 2006-02-10 19:14:57.000000000 +0100
@@ -1031,38 +1031,6 @@
return BLKPREP_KILL;
}
-static int scsi_prepare_flush_fn(request_queue_t *q, struct request *rq)
-{
- struct scsi_device *sdev = q->queuedata;
- struct scsi_driver *drv;
-
- if (sdev->sdev_state == SDEV_RUNNING) {
- drv = *(struct scsi_driver **) rq->rq_disk->private_data;
-
- if (drv->prepare_flush)
- return drv->prepare_flush(q, rq);
- }
-
- return 0;
-}
-
-static void scsi_end_flush_fn(request_queue_t *q, struct request *rq)
-{
- struct scsi_device *sdev = q->queuedata;
- struct request *flush_rq = rq->end_io_data;
- struct scsi_driver *drv;
-
- if (flush_rq->errors) {
- printk("scsi: barrier error, disabling flush support\n");
- blk_queue_ordered(q, QUEUE_ORDERED_NONE);
- }
-
- if (sdev->sdev_state == SDEV_RUNNING) {
- drv = *(struct scsi_driver **) rq->rq_disk->private_data;
- drv->end_flush(q, rq);
- }
-}
-
static int scsi_issue_flush_fn(request_queue_t *q, struct gendisk *disk,
sector_t *error_sector)
{
--
Jean Delvare
prev parent reply other threads:[~2006-02-10 18:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-10 8:15 Chris Wright
2006-02-10 8:17 ` Chris Wright
2006-02-10 18:23 ` Jean Delvare [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=20060210192324.0af51931.khali@linux-fr.org \
--to=khali@linux-fr.org \
--cc=chrisw@sous-sol.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@osdl.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®