Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756935AbXLLPSZ (ORCPT ); Wed, 12 Dec 2007 10:18:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751892AbXLLPSR (ORCPT ); Wed, 12 Dec 2007 10:18:17 -0500 Received: from palinux.external.hp.com ([192.25.206.14]:51954 "EHLO mail.parisc-linux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751307AbXLLPSQ (ORCPT ); Wed, 12 Dec 2007 10:18:16 -0500 Date: Wed, 12 Dec 2007 08:18:14 -0700 From: Matthew Wilcox To: Boaz Harrosh Cc: James Bottomley , Jens Axboe , Andrew Morton , Gabriel C , linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, Hannes Reinecke Subject: Re: [PATCH] REQ-flags to/from BIO-flags bugfix Message-ID: <20071212151813.GJ26334@parisc-linux.org> References: <20071120204525.ff27ac98.akpm@linux-foundation.org> <47462F3C.3040700@googlemail.com> <20071122201250.f957e280.akpm@linux-foundation.org> <47466B5D.90607@googlemail.com> <20071126221509.8f437b61.akpm@linux-foundation.org> <1197390783.3812.19.camel@localhost.localdomain> <475FB316.6040804@panasas.com> <475FBFEE.9010009@panasas.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <475FBFEE.9010009@panasas.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2324 Lines: 54 On Wed, Dec 12, 2007 at 01:03:10PM +0200, Boaz Harrosh wrote: > - BIO flags bio->bi_rw and REQ flags req->cmd_flags no longer match. > Remove comments and do a proper translation between the 2 systems. I'd rather see them resynchronised ... in a way that makes it obvious that they should be desynced again: I don't know whether BIO_RW_BARRIER is __REQ_SOFTBARRIER or __REQ_HARDBARRIER, so I didn't include that in this patch. There also doesn't seem to be a __REQ equivalent to BIO_RW_AHEAD, but we can do the other four bits (and leave gaps for those two). diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d18ee67..6aef34b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -167,11 +167,13 @@ enum { }; /* - * request type modified bits. first three bits match BIO_RW* bits, important + * request type modified bits. Don't change without looking at bi_rw flags */ enum rq_flag_bits { - __REQ_RW, /* not set, read. set, write */ - __REQ_FAILFAST, /* no low level driver retries */ + __REQ_RW = BIO_RW, /* not set, read. set, write */ + __REQ_FAILFAST = BIO_RW_FAILFAST, /* no low level driver retries */ + __REQ_RW_SYNC = BIO_RW_SYNC, /* request is sync (O_DIRECT) */ + __REQ_RW_META = BIO_RW_META, /* metadata io request */ __REQ_SORTED, /* elevator knows about this request */ __REQ_SOFTBARRIER, /* may not be passed by ioscheduler */ __REQ_HARDBARRIER, /* may not be passed by drive either */ @@ -185,9 +187,7 @@ enum rq_flag_bits { __REQ_QUIET, /* don't worry about errors */ __REQ_PREEMPT, /* set for "ide_preempt" requests */ __REQ_ORDERED_COLOR, /* is before or after barrier */ - __REQ_RW_SYNC, /* request is sync (O_DIRECT) */ __REQ_ALLOCED, /* request came from our alloc pool */ - __REQ_RW_META, /* metadata io request */ __REQ_NR_BITS, /* stops here */ }; -- Intel are signing my paycheques ... these opinions are still mine "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step." -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/