From patchwork Mon Sep 14 09:05:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 47261 Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8E95llS023937 for ; Mon, 14 Sep 2009 09:05:48 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 5047A61913F; Mon, 14 Sep 2009 05:05:47 -0400 (EDT) Received: from int-mx05.intmail.prod.int.phx2.redhat.com (nat-pool.util.phx.redhat.com [10.8.5.200]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n8E95jO5011989 for ; Mon, 14 Sep 2009 05:05:45 -0400 Received: from mx1.redhat.com (ext-mx03.extmail.prod.ext.phx2.redhat.com [10.5.110.7]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8E95jgt031893 for ; Mon, 14 Sep 2009 05:05:45 -0400 Received: from kernel.dk (brick.kernel.dk [93.163.65.50]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8E95YZc031833 for ; Mon, 14 Sep 2009 05:05:35 -0400 Received: by kernel.dk (Postfix, from userid 1000) id D586337A094; Mon, 14 Sep 2009 11:05:33 +0200 (CEST) Date: Mon, 14 Sep 2009 11:05:33 +0200 From: Jens Axboe To: Sebastian Andrzej Siewior Message-ID: <20090914090533.GU14984@kernel.dk> References: <20090912111928.GA8013@Chamillionaire.breakpoint.cc> <20090912195212.GF14984@kernel.dk> <20090912195839.GG14984@kernel.dk> <20090913091337.GA21969@Chamillionaire.breakpoint.cc> <20090913175717.GO14984@kernel.dk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090913175717.GO14984@kernel.dk> X-RedHat-Spam-Score: -100.782 (AWL,DNS_FROM_RFC_BOGUSMX,USER_IN_WHITELIST) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.7 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [dm-devel] Re: recent bdi changes result in WARN_ON on luksClose / dm X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com On Sun, Sep 13 2009, Jens Axboe wrote: > On Sun, Sep 13 2009, Sebastian Andrzej Siewior wrote: > > * Jens Axboe | 2009-09-12 21:58:40 [+0200]: > > > > >Don't count this as a real fix, I'll investigate closer on monday. Does > > >the warning go away with this hack? It'll ensure that pending dirty > > >inodes are flushed. > > > > That warning goes away but another pops up: > > Oh right, just goes to show that it's doing this backwards. We need the > umount rwsem for WB_SYNC_ALL. I'll look at this tomorrow. I think the safest option is to ensure that we just move these entries to our default bdi, which doesn't go away. This should fix the warning, can you test whether it works as well? diff --git a/mm/backing-dev.c b/mm/backing-dev.c index fd93566..27f82dc 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -668,7 +668,17 @@ void bdi_destroy(struct backing_dev_info *bdi) { int i; - WARN_ON(bdi_has_dirty_io(bdi)); + /* + * Splice our entries to the default_backing_dev_info, if this + * bdi disappears + */ + if (bdi_has_dirty_io(bdi)) { + struct bdi_writeback *dst = &default_backing_dev_info.wb; + + list_splice(&bdi->wb.b_dirty, &dst->b_dirty); + list_splice(&bdi->wb.b_io, &dst->b_io); + list_splice(&bdi->wb.b_more_io, &dst->b_more_io); + } bdi_unregister(bdi);