From patchwork Fri Jun 29 15:14:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 168132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D8C181007D4 for ; Sat, 30 Jun 2012 01:16:11 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SkcuK-0006Tm-0v; Fri, 29 Jun 2012 15:14:52 +0000 Received: from a.ns.miles-group.at ([95.130.255.143] helo=radon.swed.at) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Skcu9-0006Qv-Co for linux-mtd@lists.infradead.org; Fri, 29 Jun 2012 15:14:42 +0000 Received: (qmail 20710 invoked by uid 89); 29 Jun 2012 15:14:41 -0000 Received: by simscan 1.3.1 ppid: 20657, pid: 20707, t: 0.1247s scanners: attach: 1.3.1 clamav: 0.96.5/m:53 Received: from unknown (HELO localhost.localdomain) (richard@nod.at@212.62.202.73) by radon.swed.at with ESMTPA; 29 Jun 2012 15:14:41 -0000 From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 02/11] UBI: Fastmap: Amend self_check_eba() Date: Fri, 29 Jun 2012 17:14:20 +0200 Message-Id: <1340982869-77042-3-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1340982869-77042-1-git-send-email-richard@nod.at> References: <1340982869-77042-1-git-send-email-richard@nod.at> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: nyoushchenko@mvista.com, artem.bityutskiy@linux.intel.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, Heinz.Egger@linutronix.de, thomas.wucher@linutronix.de, shmulik.ladkani@gmail.com, Richard Weinberger , tglx@linutronix.de, Marius.Mazarel@ugal.ro, tim.bird@am.sony.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Don't BUG() on error and document return values. Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/attach.c | 5 ++++- drivers/mtd/ubi/eba.c | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index bd3a8f5..f1dfb63 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -1333,8 +1333,11 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) goto out_wl; } - self_check_eba(ubi, ai, scan_ai); + err = self_check_eba(ubi, ai, scan_ai); destroy_ai(ubi, scan_ai); + + if (err) + goto out_wl; } destroy_ai(ubi, ai); diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index 6d6e301..4fb80d0 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c @@ -1223,7 +1223,9 @@ static void print_rsvd_warning(struct ubi_device *ubi, * @ai_fastmap: UBI attach info object created by fastmap * @ai_scan: UBI attach info object created by scanning * - * TODO: what we do and what return. + * Returns < 0 in case of an internal error, 0 otherwise. + * If a bad EBA table entry was found it will be printed out and + * ubi_assert() triggers. */ int self_check_eba(struct ubi_device *ubi, struct ubi_attach_info *ai_fastmap, struct ubi_attach_info *ai_scan) @@ -1291,8 +1293,7 @@ int self_check_eba(struct ubi_device *ubi, struct ubi_attach_info *ai_fastmap, ubi_err("LEB:%i:%i is PEB:%i instead of %i!", vol->vol_id, i, fm_eba[i][j], scan_eba[i][j]); - /* TODO: no, please, return error instead */ - BUG(); + ubi_assert(0); } } }