From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <jens.axboe@oracle•com>
Cc: linux-next@vger•kernel.org, James Smart <James.Smart@Emulex•Com>,
James Bottomley <James.Bottomley@HansenPartnership•com>,
Tejun Heo <tj@kernel•org>,
FUJITA Tomonori <fujita.tomonori@lab•ntt.co.jp>
Subject: linux-next: block tree build failure
Date: Wed, 13 May 2009 14:04:13 +1000 [thread overview]
Message-ID: <20090513140413.b8a3c8d0.sfr@canb.auug.org.au> (raw)
Hi Jens,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
drivers/scsi/scsi_transport_fc.c: In function 'fc_bsg_jobdone':
drivers/scsi/scsi_transport_fc.c:3428: error: 'struct request' has no member named 'data_len'
drivers/scsi/scsi_transport_fc.c:3434: error: 'struct request' has no member named 'data_len'
drivers/scsi/scsi_transport_fc.c:3437: error: implicit declaration of function 'blk_end_bidi_request'
drivers/scsi/scsi_transport_fc.c: In function 'fc_bsg_map_buffer':
drivers/scsi/scsi_transport_fc.c:3499: error: 'struct request' has no member named 'data_len'
drivers/scsi/scsi_transport_fc.c: In function 'fc_bsg_request_handler':
drivers/scsi/scsi_transport_fc.c:3765: error: implicit declaration of function 'elv_next_request'
drivers/scsi/scsi_transport_fc.c:3765: warning: assignment makes pointer from integer without a cast
drivers/scsi/scsi_transport_fc.c:3772: error: implicit declaration of function 'blkdev_dequeue_request'
Caused by commit 1bfe9caaff367601134c14fc428017419f628f7d ("[SCSI] FC
Pass Thru support") from the scsi tree interacting with commits
a2dec7b36364a5cc564c4d76cf16d2e7d33f5c05 ("block: hide request sector and
data_len"), 9934c8c04561413609d2bc38c6b9f268cba774a4 ("block:
implement and enforce request peek/start/fetch") and
b1f744937f1be3e6d3009382a755679133cf782d ("block: move completion related
functions back to blk-core.c") from the block tree.
Removing old interfaces is a particularly unfriendly thing to do within
the same time frame as creating replacements. Better would be to
deprecate them or reimplement them in terms of the new interfaces if
possible.
I have reverted commit b1f744937f1be3e6d3009382a755679133cf782d ("block:
move completion related functions back to blk-core.c") and applied the
following patch (which I realise is probably not correct) for today.
Maybe someone can come up with a better solution for the scsi guys and me.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 13 May 2009 13:54:48 +1000
Subject: [PATCH] scsi/block: fixup scsi_transport_fc for block changes
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/scsi/scsi_transport_fc.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 4df8c3c..c8b8fb7 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3425,13 +3425,13 @@ fc_bsg_jobdone(struct fc_bsg_job *job)
job->req->sense_len = job->reply_len;
/* we assume all request payload was transferred, residual == 0 */
- req->data_len = 0;
+ req->__data_len = 0;
if (rsp) {
rsp_len = blk_rq_bytes(rsp);
BUG_ON(job->reply->reply_payload_rcv_len > rsp_len);
/* set reply (bidi) residual */
- rsp->data_len = (rsp_len - job->reply->reply_payload_rcv_len);
+ rsp->__data_len = (rsp_len - job->reply->reply_payload_rcv_len);
}
blk_end_bidi_request(req, err, req_len, rsp_len);
@@ -3496,7 +3496,7 @@ fc_bsg_map_buffer(struct fc_bsg_buffer *buf, struct request *req)
return -ENOMEM;
sg_init_table(buf->sg_list, req->nr_phys_segments);
buf->sg_cnt = blk_rq_map_sg(req->q, req, buf->sg_list);
- buf->payload_len = req->data_len;
+ buf->payload_len = blk_rq_bytes(req);
return 0;
}
@@ -3762,14 +3762,14 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost,
return;
while (!blk_queue_plugged(q)) {
- req = elv_next_request(q);
+ req = blk_peek_request(q);
if (!req)
break;
if (rport && (rport->port_state == FC_PORTSTATE_BLOCKED))
break;
- blkdev_dequeue_request(req);
+ blk_start_request(req);
if (rport && (rport->port_state != FC_PORTSTATE_ONLINE)) {
req->errors = -ENXIO;
--
1.6.3
next reply other threads:[~2009-05-13 4:04 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-13 4:04 Stephen Rothwell [this message]
2009-05-13 9:21 ` linux-next: block tree build failure Tejun Heo
2009-05-13 12:07 ` James Bottomley
2009-05-15 0:45 ` Tejun Heo
2009-05-15 2:35 ` James Bottomley
2009-05-15 2:47 ` Tejun Heo
2009-05-15 3:24 ` James Bottomley
2009-05-15 3:38 ` Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2009-12-07 8:44 Stephen Rothwell
2009-12-07 8:49 ` Jens Axboe
2009-12-07 9:23 ` Stephen Rothwell
2009-12-07 9:28 ` Jens Axboe
2009-12-04 3:36 Stephen Rothwell
2009-12-04 7:43 ` Jens Axboe
2009-12-04 13:54 ` Jens Axboe
2009-12-04 22:49 ` Stephen Rothwell
2009-12-05 9:20 ` Jens Axboe
2009-10-27 3:34 Stephen Rothwell
2009-10-27 5:31 ` Jens Axboe
2009-10-27 5:50 ` Stephen Rothwell
2009-10-07 2:55 Stephen Rothwell
[not found] ` <20091007135505.df1f058c.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2009-10-07 6:33 ` Jens Axboe
2009-09-23 4:51 Stephen Rothwell
2009-09-23 7:11 ` Lars Ellenberg
2009-09-23 7:32 ` Stephen Rothwell
[not found] ` <20090923071152.GA8000-pI6ZZpWkm2Ob3Om96lsyHpni2hclXnRB@public.gmane.org>
2009-09-23 11:12 ` Lars Ellenberg
[not found] ` <20090923111225.GC8000-pI6ZZpWkm2Ob3Om96lsyHpni2hclXnRB@public.gmane.org>
2009-09-23 11:56 ` Stephen Rothwell
2009-09-14 4:27 Stephen Rothwell
2009-09-14 6:25 ` Jens Axboe
2009-09-11 4:32 Stephen Rothwell
2009-09-11 5:30 ` Jens Axboe
2009-09-01 4:59 Stephen Rothwell
2009-09-01 5:30 ` Stephen Rothwell
2009-09-01 5:38 ` Jens Axboe
2009-09-01 8:13 ` Jens Axboe
2009-09-01 8:38 ` Stephen Rothwell
2009-07-07 3:49 Stephen Rothwell
2009-07-07 6:38 ` Jens Axboe
2009-07-07 6:45 ` Stephen Rothwell
2009-07-07 13:57 ` Christoph Hellwig
2009-07-07 14:31 ` Jens Axboe
2009-07-08 3:17 ` Stephen Rothwell
2009-07-08 6:55 ` Jens Axboe
2009-07-07 13:55 ` Christoph Hellwig
2009-07-08 0:41 ` Stephen Rothwell
2009-06-26 2:53 Stephen Rothwell
2009-06-26 4:34 ` NeilBrown
2009-06-26 4:39 ` Jens Axboe
2009-06-26 5:49 ` Neil Brown
2009-06-26 9:00 ` Jens Axboe
2009-05-25 4:35 Stephen Rothwell
2009-05-25 5:38 ` Martin K. Petersen
2009-05-25 5:54 ` Stephen Rothwell
2009-04-09 3:37 Stephen Rothwell
2009-04-14 2:35 ` Stephen Rothwell
2009-04-14 6:21 ` Jens Axboe
2009-04-14 6:26 ` Stephen Rothwell
2009-04-14 6:32 ` Jens Axboe
2008-11-26 10:29 Stephen Rothwell
2008-11-26 10:42 ` Ingo Molnar
2008-11-26 10:47 ` Jens Axboe
2008-11-26 11:16 ` Ingo Molnar
2008-11-26 11:20 ` Jens Axboe
2008-11-26 11:28 ` Ingo Molnar
2008-11-26 11:23 ` Mathieu Desnoyers
2008-11-26 11:25 ` Ingo Molnar
[not found] <20081110145442.d60e57b7.sfr@canb.auug.org.au>
2008-11-10 4:13 ` malahal
2008-11-10 4:46 ` malahal
2008-11-10 12:12 ` Jens Axboe
2008-09-18 3:04 Stephen Rothwell
2008-09-18 4:31 ` Jens Axboe
2008-09-15 5:18 Stephen Rothwell
2008-09-15 5:38 ` Alex Dubov
2008-09-15 13:18 ` Jens Axboe
2008-09-03 6:15 Stephen Rothwell
2008-09-03 6:34 ` Jens Axboe
2008-09-03 7:04 ` Andrew Morton
2008-09-03 7:07 ` Jens Axboe
2008-09-03 8:50 ` Stephen Rothwell
2008-09-03 16:05 ` Andrew Morton
2008-09-03 16:27 ` Tejun Heo
2008-09-03 16:32 ` Andrew Morton
2008-09-03 17:29 ` Tejun Heo
2008-09-04 4:06 ` Andrew Morton
2008-08-29 5:07 Stephen Rothwell
2008-08-29 9:00 ` Jens Axboe
[not found] <20080627165326.9222c841.sfr@canb.auug.org.au>
2008-06-27 7:00 ` Jens Axboe
2008-06-27 7:14 ` Jens Axboe
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=20090513140413.b8a3c8d0.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=James.Smart@Emulex$(echo .)Com \
--cc=fujita.tomonori@lab$(echo .)ntt.co.jp \
--cc=jens.axboe@oracle$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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