From patchwork Wed Apr 20 10:18:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 92163 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 ozlabs.org (Postfix) with ESMTPS id 2A74AB6FCD for ; Wed, 20 Apr 2011 20:20:56 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QCUT6-0006mq-31; Wed, 20 Apr 2011 10:17:08 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1QCUT4-0006Ep-C7; Wed, 20 Apr 2011 10:17:06 +0000 Received: from smtp.nokia.com ([147.243.1.47] helo=mgw-sa01.nokia.com) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QCURt-00065M-1a for linux-mtd@lists.infradead.org; Wed, 20 Apr 2011 10:16:00 +0000 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa01.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id p3KAFnak009530 for ; Wed, 20 Apr 2011 13:15:51 +0300 Received: from eru.research.nokia.com ([[172.21.24.121]]) by mgw-sa01.nokia.com with ESMTP id p3KAFTS3009198 ; Wed, 20 Apr 2011 13:15:34 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 10/35] fs-tests: integck: handle errors in file_mmap_write Date: Wed, 20 Apr 2011 13:18:43 +0300 Message-Id: <1303294748-5492-11-git-send-email-dedekind1@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1303294748-5492-1-git-send-email-dedekind1@gmail.com> References: <1303294748-5492-1-git-send-email-dedekind1@gmail.com> X-Nokia-AV: Clean X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110420_061553_720146_FF45A989 X-CRM114-Status: GOOD ( 12.02 ) X-Spam-Score: 3.4 (+++) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (3.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, low trust [147.243.1.47 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (dedekind1[at]gmail.com) 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 2.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (dedekind1[at]gmail.com) 0.0 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Cc: Adrian Hunter X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 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 From: Artem Bityutskiy Teach 'file_mmap_write()' to propagate failures up to the caller. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 37 ++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index 7348e14..778e35c 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -921,26 +921,28 @@ static int file_ftruncate(struct file_info *file, int fd, off_t new_length) return 0; } -static void file_mmap_write(struct file_info *file) +/* + * 'mmap()' a file and randomly select where to write data. + */ +static int file_mmap_write(struct file_info *file) { size_t write_cnt = 0, r, i, len, size; struct write_info *w = file->writes; void *addr; - char *waddr; + char *waddr, *path; off_t offs, offset; - unsigned seed; + unsigned int seed; uint64_t free_space; int fd; - char *path; if (!file->links) - return; + return 0; get_fs_space(NULL, &free_space); if (!free_space) - return; + return 0; /* Randomly pick a written area of the file */ if (!w) - return; + return 0; while (w) { write_cnt += 1; w = w->next; @@ -959,12 +961,15 @@ static void file_mmap_write(struct file_info *file) path = dir_path(file->links->parent, file->links->name); fd = open(path, O_RDWR); CHECK(fd != -1); - free(path); /* mmap it */ addr = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, offs); CHECK(close(fd) == 0); - CHECK(addr != MAP_FAILED); + if (addr == MAP_FAILED) { + pcv("cannot mmap file %s", path); + free(path); + return -1; + } /* Randomly select a part of the mmapped area to write */ size = random_no(w->size); @@ -982,10 +987,16 @@ static void file_mmap_write(struct file_info *file) waddr[i] = rand(); /* Unmap it */ - CHECK(munmap(addr, len) == 0); + if (munmap(addr, len)) { + pcv("cannot unmap file %s", path); + free(path); + return -1; + } /* Record what was written */ file_write_info(file, offset, size, seed); + free(path); + return 0; } /* @@ -1000,10 +1011,8 @@ static int file_write(struct file_info *file, int fd) int ret, truncate = 0; if (fsinfo.can_mmap && !full && !file->deleted && - random_no(100) == 1) { - file_mmap_write(file); - return 0; - } + random_no(100) == 1) + return file_mmap_write(file); get_offset_and_size(file, &offset, &size); seed = random_no(MAX_RANDOM_SEED);