From patchwork Thu Oct 17 17:05:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 284320 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 898822C00A9 for ; Fri, 18 Oct 2013 04:06:09 +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 1VWr1P-0004sz-Tn; Thu, 17 Oct 2013 17:06:03 +0000 Received: from mail.tpi.com ([74.45.170.26]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VWr1E-0004r7-JH for kernel-team@lists.ubuntu.com; Thu, 17 Oct 2013 17:05:52 +0000 Received: from salmon.rtg.net (mail.tpi.com [10.0.0.205]) by mail.tpi.com (Postfix) with ESMTP id 89E6C33EFCF for ; Thu, 17 Oct 2013 10:05:51 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id 1E00C225C0; Thu, 17 Oct 2013 11:05:50 -0600 (MDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2 Saucy SRU] UBUNTU: dm-raid4-5: Fix compile issues Date: Thu, 17 Oct 2013 11:05:49 -0600 Message-Id: <1382029550-127756-1-git-send-email-tim.gardner@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 BugLink: http://bugs.launchpad.net/bugs/1241086 Signed-off-by: Tim Gardner --- ubuntu/dm-raid4-5/dm-raid4-5.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu/dm-raid4-5/dm-raid4-5.c b/ubuntu/dm-raid4-5/dm-raid4-5.c index e87eac4..a570dcf 100644 --- a/ubuntu/dm-raid4-5/dm-raid4-5.c +++ b/ubuntu/dm-raid4-5/dm-raid4-5.c @@ -910,7 +910,7 @@ static int raid_dev_lookup(struct raid_set *rs, struct raid_dev *dev_lookup) * Stripe hash functions */ /* Initialize/destroy stripe hash. */ -static int hash_init(struct stripe_hash *hash, unsigned stripes) +static int dm45_hash_init(struct stripe_hash *hash, unsigned stripes) { unsigned buckets = 2, max_buckets = stripes >> 1; static unsigned hash_primes[] = { @@ -996,7 +996,7 @@ static int sc_hash_resize(struct stripe_cache *sc) int r; struct stripe_hash hash; - r = hash_init(&hash, atomic_read(&sc->stripes)); + r = dm45_hash_init(&hash, atomic_read(&sc->stripes)); if (r) return r; @@ -1723,7 +1723,7 @@ static void bio_copy_page_list(int rw, struct stripe *stripe, bio_for_each_segment(bv, bio, i) { int len = bv->bv_len, size; unsigned bio_offset = 0; - void *bio_addr = __bio_kmap_atomic(bio, i, KM_USER0); + void *bio_addr = __bio_kmap_atomic(bio, i); redo: size = (page_offset + len > PAGE_SIZE) ? PAGE_SIZE - page_offset : len; @@ -1756,7 +1756,7 @@ redo: } } - __bio_kunmap_atomic(bio_addr, KM_USER0); + __bio_kunmap_atomic(bio_addr); } }