From patchwork Wed Dec 5 13:16:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 203863 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 287262C00BE for ; Thu, 6 Dec 2012 00:16:29 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TgEpn-0005i9-EF; Wed, 05 Dec 2012 13:16:19 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TgEpl-0005ho-He for kernel-team@lists.ubuntu.com; Wed, 05 Dec 2012 13:16:17 +0000 Received: from p5b2e44b3.dip.t-dialin.net ([91.46.68.179] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TgEpl-0004tg-CX for kernel-team@lists.ubuntu.com; Wed, 05 Dec 2012 13:16:17 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] UBUNTU: ubuntu: dm-raid45: Adapt to upstream interface changes Date: Wed, 5 Dec 2012 14:16:12 +0100 Message-Id: <1354713373-2950-2-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1354713373-2950-1-git-send-email-stefan.bader@canonical.com> References: <1354713373-2950-1-git-send-email-stefan.bader@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Device-mapper interface has renamed one element in the mapped device structure and added one argument to the status function. This fixes the FTBS in Raring. Signed-off-by: Stefan Bader --- ubuntu/dm-raid4-5/dm-raid4-5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/dm-raid4-5/dm-raid4-5.c b/ubuntu/dm-raid4-5/dm-raid4-5.c index e05b0e1..9f55f58 100644 --- a/ubuntu/dm-raid4-5/dm-raid4-5.c +++ b/ubuntu/dm-raid4-5/dm-raid4-5.c @@ -4073,7 +4073,7 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv) * Make sure that dm core only hands maximum io size * length down and pays attention to io boundaries. */ - ti->split_io = rs->set.io_size; + ti->max_io_len = rs->set.io_size; ti->private = rs; /* Initialize work queue to handle this RAID set's io. */ @@ -4246,7 +4246,7 @@ static void raid_devel_stats(struct dm_target *ti, char *result, } static int raid_status(struct dm_target *ti, status_type_t type, - char *result, unsigned maxlen) + unsigned status_flags, char *result, unsigned maxlen) { unsigned p, sz = 0; char buf[BDEVNAME_SIZE];