From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754042AbZBPH34 (ORCPT ); Mon, 16 Feb 2009 02:29:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756107AbZBPH3d (ORCPT ); Mon, 16 Feb 2009 02:29:33 -0500 Received: from brick.kernel.dk ([93.163.65.50]:14930 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756077AbZBPH3c (ORCPT ); Mon, 16 Feb 2009 02:29:32 -0500 Date: Mon, 16 Feb 2009 08:27:11 +0100 From: Jens Axboe To: "Michael S. Tsirkin" Cc: pavel@suse.cz, rjw@sisk.pl, linux-pm@lists.linux-foundation.org, Linux Kernel Mailing List , bugme-daemon@bugzilla.kernel.org Subject: Re: [Bug 12713] Hang on resume from hibernation, apparently as result of 213d9417fec Message-ID: <20090216072711.GJ30821@kernel.dk> References: <8f53421d0902151605v56c92642ib8c2dcf34fd92ad1@mail.gmail.com> <8f53421d0902151607w2985dce6yc1bef7e717166fc@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8f53421d0902151607w2985dce6yc1bef7e717166fc@mail.gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 16 2009, Michael S. Tsirkin wrote: > On Mon, Feb 16, 2009 at 2:05 AM, Michael S. Tsirkin > wrote: > > Summary: seem to need to revert 213d9417fec62ef4c3675621b9364a667954d4dd > > to fix resume from hibernation. Bugzilla entry created: > > http://bugzilla.kernel.org/show_bug.cgi?id=12713 > > Looking over this, I see something strange in the commit in question: > > diff --git a/include/linux/bio.h b/include/linux/bio.h > index 5175aa3..f53568c 100644 > --- a/include/linux/bio.h > +++ b/include/linux/bio.h > @@ -163,12 +163,15 @@ struct bio { > #define BIO_RW 0 /* Must match RW in req flags (blkdev.h) */ > #define BIO_RW_AHEAD 1 /* Must match FAILFAST in req flags */ > #define BIO_RW_BARRIER 2 > -#define BIO_RW_SYNC 3 > -#define BIO_RW_META 4 > -#define BIO_RW_DISCARD 5 > -#define BIO_RW_FAILFAST_DEV 6 > -#define BIO_RW_FAILFAST_TRANSPORT 7 > -#define BIO_RW_FAILFAST_DRIVER 8 > +#define BIO_RW_SYNCIO 3 > +#define BIO_RW_UNPLUG 4 > +#define BIO_RW_META 5 > +#define BIO_RW_DISCARD 6 > +#define BIO_RW_FAILFAST_DEV 7 > +#define BIO_RW_FAILFAST_TRANSPORT 8 > +#define BIO_RW_FAILFAST_DRIVER 9 > + > +#define BIO_RW_SYNC (BIO_RW_SYNCIO | BIO_RW_UNPLUG) > > /* > * upper 16 bits of bi_rw define the io priority of this bio > > I haven't read the code in depth, but taking running numbers and doing > bitwise "or" > on them looks a bit strange to me. > So here BIO_RW_SYNC is (3 | 4) = 7, that is the same as BIO_RW_FAILFAST_DEV. > So for example bio_failfast_dev and bio_sync are the same. > > Jens, could you comment on this please? Is this intentional? That's clearly a braino, you can't OR the shift values of course. I'll get it fixed up asap! -- Jens Axboe