From patchwork Thu Jun 11 18:16:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jehan Bing X-Patchwork-Id: 28576 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id D2615B7161 for ; Fri, 12 Jun 2009 04:19:33 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MEopL-0000C9-3g; Thu, 11 Jun 2009 18:16:39 +0000 Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1MEopC-0000C1-I2 for linux-mtd@lists.infradead.org; Thu, 11 Jun 2009 18:16:37 +0000 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1MEopA-0003AR-L1 for linux-mtd@lists.infradead.org; Thu, 11 Jun 2009 18:16:28 +0000 Received: from adsl-99-185-243-218.dsl.pltn13.sbcglobal.net ([99.185.243.218]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 11 Jun 2009 18:16:28 +0000 Received: from jehan by adsl-99-185-243-218.dsl.pltn13.sbcglobal.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 11 Jun 2009 18:16:28 +0000 X-Injected-Via-Gmane: http://gmane.org/ To: linux-mtd@lists.infradead.org From: Jehan Bing Subject: [PATCH] [MTD-UTILS] Fix for perror modifying errno in nandwrite Date: Thu, 11 Jun 2009 11:16:12 -0700 Lines: 37 Message-ID: <4A3149EC.5030705@orb.com> Mime-Version: 1.0 X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: adsl-99-185-243-218.dsl.pltn13.sbcglobal.net User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) X-Spam-Score: -1.0 (-) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (-1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [80.91.229.2 listed in list.dnswl.org] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Since perror returns void, I assumed it wouldn't modify errno. I was wrong. And since the change was so simple, I didn't test it. Mea culpa. :( This patch fixes it. I don't use perror if pwrite fails with EIO because it's not useful. The failure of lseek or the message "Erasing failed write ..." implicitly says so since it's the only way to reach that code. There is not such additional message for the MEMERASE error so I use a temporary variable instead. Signed-off-by: Jehan Bing --- a/nandwrite.c +++ b/nandwrite.c @@ -585,8 +585,8 @@ int main(int argc, char * const argv[]) off_t rewind_bytes; erase_info_t erase; - perror ("pwrite"); if (errno != EIO) { + perror("pwrite"); goto closeall; } @@ -605,8 +605,9 @@ int main(int argc, char * const argv[]) fprintf(stderr, "Erasing failed write from %08lx-%08lx\n", (long)erase.start, (long)erase.start+erase.length-1); if (ioctl(fd, MEMERASE, &erase) != 0) { + int errno_tmp = errno; perror("MEMERASE"); - if (errno != EIO) { + if (errno_tmp != EIO) { goto closeall; } }