From patchwork Wed Sep 8 16:50:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Cross X-Patchwork-Id: 178222 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-0.6 required=2.9 tests=RCVD_IN_DNSWL_LOW, SUBJECT_FUZZY_TION autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Wed, 08 Sep 2010 17:51:35 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OtNrz-00018r-E3 for chris@printf.net; Wed, 08 Sep 2010 17:51:35 +0100 Received: by mail.laptop.org (Postfix) id AD084245C1; Wed, 8 Sep 2010 12:51:15 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 939F1245C0 for ; Wed, 8 Sep 2010 12:51:15 -0400 (EDT) X-ASG-Debug-ID: 1283964693-0b744f700001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id 75uddpQAoMA4P30p for ; Wed, 08 Sep 2010 12:51:33 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755186Ab0IHQvA (ORCPT ); Wed, 8 Sep 2010 12:51:00 -0400 Received: from smtp-out.google.com ([216.239.44.51]:35693 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752773Ab0IHQu7 (ORCPT ); Wed, 8 Sep 2010 12:50:59 -0400 Received: from hpaq2.eem.corp.google.com (hpaq2.eem.corp.google.com [172.25.149.2]) by smtp-out.google.com with ESMTP id o88GorCW014999; Wed, 8 Sep 2010 09:50:54 -0700 Received: from walnut.mtv.corp.google.com (walnut.mtv.corp.google.com [172.18.102.62]) by hpaq2.eem.corp.google.com with ESMTP id o88GopaU006966; Wed, 8 Sep 2010 09:50:52 -0700 Received: by walnut.mtv.corp.google.com (Postfix, from userid 99897) id 381DBE40EF; Wed, 8 Sep 2010 09:50:51 -0700 (PDT) From: Colin Cross To: Olof Johansson Cc: Kay Sievers , Lei Wen , Andrew Morton , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Mandeep Baines , Colin Cross X-ASG-Orig-Subj: [PATCH] mmc_block: Allow more than 8 partitions per card Subject: [PATCH] mmc_block: Allow more than 8 partitions per card Date: Wed, 8 Sep 2010 09:50:37 -0700 Message-Id: <1283964637-28246-1-git-send-email-ccross@android.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: X-System-Of-Record: true Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1283964693 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.41 X-Barracuda-Spam-Status: No, SCORE=0.41 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests=SUBJECT_FUZZY_TION X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.40298 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.41 SUBJECT_FUZZY_TION Attempt to obfuscate words in Subject: diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index d545f79..07d8eb0 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -87,11 +87,7 @@ static void mmc_blk_put(struct mmc_blk_data *md) mutex_lock(&open_lock); md->usage--; if (md->usage == 0) { - int devmaj = MAJOR(disk_devt(md->disk)); - int devidx = MINOR(disk_devt(md->disk)) >> MMC_SHIFT; - - if (!devmaj) - devidx = md->disk->first_minor >> MMC_SHIFT; + int devidx = md->disk->first_minor >> MMC_SHIFT; blk_cleanup_queue(md->queue.queue); @@ -607,6 +603,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) md->disk->private_data = md; md->disk->queue = md->queue.queue; md->disk->driverfs_dev = &card->dev; + md->disk->flags = GENHD_FL_EXT_DEVT; /* * As discussed on lkml, GENHD_FL_REMOVABLE should: