From patchwork Wed Apr 20 10:18:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 92164 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 98A3FB6FCD for ; Wed, 20 Apr 2011 20:21:13 +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 1QCUTH-00074X-P2; Wed, 20 Apr 2011 10:17:20 +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 1QCUTG-0006FJ-5P; Wed, 20 Apr 2011 10:17:18 +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-00065X-Gh 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 p3KAFmDA009486 for ; Wed, 20 Apr 2011 13:15:52 +0300 Received: from eru.research.nokia.com ([[172.21.24.121]]) by mgw-sa01.nokia.com with ESMTP id p3KAFTS4009198 ; Wed, 20 Apr 2011 13:15:34 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 11/35] fs-tests: integck: teach file_write_data return an error Date: Wed, 20 Apr 2011 13:18:44 +0300 Message-Id: <1303294748-5492-12-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_061554_136745_CAFCC769 X-CRM114-Status: GOOD ( 11.50 ) 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 Make 'file_write_data()' return an error in case of failure. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index 778e35c..67085ec 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -729,11 +729,13 @@ static struct fd_info *file_open(struct file_info *file) #define BUFFER_SIZE 32768 -static size_t file_write_data( struct file_info *file, - int fd, - off_t offset, - size_t size, - unsigned seed) +/* + * Write random 'size' bytes of random data to offset 'offset'. Seed the random + * gererator with 'seed'. Return amount of written data on success and -1 on + * failure. + */ +static ssize_t file_write_data(struct file_info *file, int fd, + off_t offset, size_t size, unsigned seed) { size_t remains, actual, block; ssize_t written; @@ -760,10 +762,15 @@ static size_t file_write_data( struct file_info *file, block = remains; written = write(fd, buf, block); if (written < 0) { - CHECK(errno == ENOSPC); /* File system full */ - full = 1; - file->no_space_error = 1; - break; + if (errno == ENOSPC) { + full = 1; + file->no_space_error = 1; + break; + } + pcv("failed to write %zu bytes to offset %llu of file %s", + block, (unsigned long long)(offset + actual), + file->name); + return -1; } remains -= written; actual += written; @@ -1006,7 +1013,8 @@ static int file_mmap_write(struct file_info *file) static int file_write(struct file_info *file, int fd) { off_t offset; - size_t size, actual; + size_t size; + ssize_t actual; unsigned seed; int ret, truncate = 0; @@ -1017,10 +1025,11 @@ static int file_write(struct file_info *file, int fd) get_offset_and_size(file, &offset, &size); seed = random_no(MAX_RANDOM_SEED); actual = file_write_data(file, fd, offset, size, seed); + if (actual < 0) + return -1; if (offset + actual <= file->length && shrink) - /* 1 time in 100, when shrinking - truncate after the write */ + /* 1 time in 100, when shrinking truncate after the write */ if (random_no(100) == 0) truncate = 1;