From patchwork Fri Jun 1 15:16:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 162345 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [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 5C8DCB7007 for ; Sat, 2 Jun 2012 01:20:41 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SaTdV-00031k-Cf; Fri, 01 Jun 2012 15:19:33 +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 1SaTbB-0001jo-ED for linux-mtd@lists.infradead.org; Fri, 01 Jun 2012 15:17:19 +0000 Received: (qmail 26223 invoked by uid 89); 1 Jun 2012 15:17:08 -0000 Received: by simscan 1.3.1 ppid: 25860, pid: 26220, t: 0.1351s 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; 1 Jun 2012 15:17:07 -0000 From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 21/23] UBI: Fastmap: Fix error message Date: Fri, 1 Jun 2012 17:16:42 +0200 Message-Id: <1338563804-85990-22-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1338563804-85990-1-git-send-email-richard@nod.at> References: <1338563804-85990-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: dedekind1@gmail.com, Richard Weinberger , adrian.hunter@intel.com, Heinz.Egger@linutronix.de, shmulik.ladkani@gmail.com, tglx@linutronix.de, 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 Print the message in ubi_scan_fastmap(). Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/attach.c | 10 ---------- drivers/mtd/ubi/fastmap.c | 3 +++ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index 4d86621..44f3770 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -1222,16 +1222,6 @@ int ubi_attach(struct ubi_device *ubi) err = ubi_scan_fastmap(ubi, ai); if (err > 0) { - /* TODO: in UBIFS we have a convention: every function prints - * its own error messages. This makes things cleaner and easier - * - the caller should not care about printing anything. - * Please, move this error message to 'ubi_scan_fastmap()'. And - * keep this in mind, and do similar thing globally for entire - * fastmap code. */ - if (err == UBI_BAD_FASTMAP) - ubi_err("Attach by fastmap failed! " - "Falling back to attach by scanning."); - err = scan_all(ubi, ai); if (err) return err; diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 78f196d..90bcaf0 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -936,6 +936,9 @@ free_hdr: free_raw: vfree(fm_raw); out: + if (ret == UBI_BAD_FASTMAP) + ubi_err("Attach by fastmap failed, doing a full scan!"); + return ret; }