From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: Re: [PATCH 1/2] block: remove wrappers for request type/flags Date: Fri, 18 Jun 2010 12:09:17 +0200 Message-ID: <4C1B45CD.10006@kernel.dk> References: <20100618074645.GA13358@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: linux-fsdevel@vger.kernel.org To: Christoph Hellwig Return-path: Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:43096 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752577Ab0FRKJb (ORCPT ); Fri, 18 Jun 2010 06:09:31 -0400 In-Reply-To: <20100618074645.GA13358@lst.de> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: > Index: linux-2.6/drivers/block/virtio_blk.c > =================================================================== > --- linux-2.6.orig/drivers/block/virtio_blk.c 2010-06-16 21:15:41.120004099 +0200 > +++ linux-2.6/drivers/block/virtio_blk.c 2010-06-17 13:21:18.988006543 +0200 > @@ -65,13 +65,16 @@ static void blk_done(struct virtqueue *v > break; > } > > - if (blk_pc_request(vbr->req)) { > + switch (vbr->req->cmd_type) { > + case REQ_TYPE_BLOCK_PC: > vbr->req->resid_len = vbr->in_hdr.residual; > vbr->req->sense_len = vbr->in_hdr.sense_len; > vbr->req->errors = vbr->in_hdr.errors; > - } > - if (blk_special_request(vbr->req)) > + break; > + case REQ_TYPE_SPECIAL: > vbr->req->errors = (error != 0); > + break; > + } This conversion also makes gcc unhappy, since you don't supply a default case. A bit silly since it's the end of the processing, I'll add one just to shut it up. -- Jens Axboe