From patchwork Wed Mar 27 09:59:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 231645 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 011902C00A5 for ; Wed, 27 Mar 2013 20:59:39 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UKn8k-0007Cy-Ok; Wed, 27 Mar 2013 09:59:30 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UKn8j-0007Ct-Du for kernel-team@lists.ubuntu.com; Wed, 27 Mar 2013 09:59:29 +0000 Received: from p5b2e3694.dip.t-dialin.net ([91.46.54.148] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UKn8j-0002sO-7r for kernel-team@lists.ubuntu.com; Wed, 27 Mar 2013 09:59:29 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [Raring] dm-raid45: Fix incompatible ptr assignments Date: Wed, 27 Mar 2013 10:59:28 +0100 Message-Id: <1364378368-6988-1-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com Seem luckily the return type of the status function did not matter when being used. Same goes for the additional argument to the map function which was not used by the function. -Stefan --- From 3ad60179d7960c66c38bda4539c76b460b271b61 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Wed, 27 Mar 2013 10:19:32 +0100 Subject: [PATCH] UBUNTU: SAUCE: dm-raid45: Fix incompatible ptr assignments Fixing two incorrect assignments reported by Intel kbuild test. dm-raid4-5.c:4501:2: warning: initialization from incompatible pointer type [enabled by default] (near initialization for 'raid_target.map') dm-raid4-5.c:4505:2: warning: initialization from incompatible pointer type (near initialization for 'raid_target.status') Signed-off-by: Stefan Bader --- ubuntu/dm-raid4-5/dm-raid4-5.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ubuntu/dm-raid4-5/dm-raid4-5.c b/ubuntu/dm-raid4-5/dm-raid4-5.c index 9f55f58..e87eac4 100644 --- a/ubuntu/dm-raid4-5/dm-raid4-5.c +++ b/ubuntu/dm-raid4-5/dm-raid4-5.c @@ -4101,8 +4101,7 @@ static void raid_dtr(struct dm_target *ti) } /* Raid mapping function. */ -static int raid_map(struct dm_target *ti, struct bio *bio, - union map_info *map_context) +static int raid_map(struct dm_target *ti, struct bio *bio) { /* I don't want to waste stripe cache capacity. */ if (bio_rw(bio) == READA) @@ -4245,7 +4244,7 @@ static void raid_devel_stats(struct dm_target *ti, char *result, *size = sz; } -static int raid_status(struct dm_target *ti, status_type_t type, +static void raid_status(struct dm_target *ti, status_type_t type, unsigned status_flags, char *result, unsigned maxlen) { unsigned p, sz = 0; @@ -4306,8 +4305,6 @@ static int raid_status(struct dm_target *ti, status_type_t type, format_dev_t(buf, rs->dev[p].dev->bdev->bd_dev), (unsigned long long) rs->dev[p].start); } - - return 0; } /*