Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161415AbWJ3TQk (ORCPT ); Mon, 30 Oct 2006 14:16:40 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161417AbWJ3TQk (ORCPT ); Mon, 30 Oct 2006 14:16:40 -0500 Received: from mx1.redhat.com ([66.187.233.31]:25743 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S1161415AbWJ3TQj (ORCPT ); Mon, 30 Oct 2006 14:16:39 -0500 Date: Mon, 30 Oct 2006 19:15:54 +0000 From: Alasdair G Kergon To: Linus Torvalds Cc: herbert@gondor.apana.org.au, linux-kernel@vger.kernel.org, Stefan Schmidt , dm-devel@redhat.com, dm-crypt@saout.de, Christophe Saout , Andrew Morton Subject: Re: [BUG] dmsetup table output changed from 2.6.18 to 2.6.19-rc3 and breaks yaird. Message-ID: <20061030191554.GN1319@agk.surrey.redhat.com> Mail-Followup-To: Linus Torvalds , herbert@gondor.apana.org.au, linux-kernel@vger.kernel.org, Stefan Schmidt , dm-devel@redhat.com, dm-crypt@saout.de, Christophe Saout , Andrew Morton References: <20061030151930.GQ27337@susi> <20061030184331.GY3928@agk.surrey.redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1115 Lines: 37 On Mon, Oct 30, 2006 at 11:00:29AM -0800, Linus Torvalds wrote: > (maybe something like this trivial one? Totally untested, but it would > seem to be the sane approach) > diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c > index a625576..645e3ce 100644 > --- a/drivers/md/dm-crypt.c > +++ b/drivers/md/dm-crypt.c > @@ -925,8 +925,7 @@ static int crypt_status(struct dm_target > break; > > case STATUSTYPE_TABLE: > - cipher = crypto_blkcipher_name(cc->tfm); > - > + cipher = cc->cipher; > chainmode = cc->chainmode; > > if (cc->iv_mode) > > Looks correct. The point of STATUSTYPE_TABLE is to return (readable) output to userspace in a format that the crypt_ctr() function would accept back in. So crypt_ctr() now stores a private copy of cipher and chainmode for crypt_status() to regurgitate when requested. Alasdair -- agk@redhat.com - 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/