From patchwork Wed Apr 20 10:18:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 92174 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 EED90B6FD7 for ; Wed, 20 Apr 2011 20:22:35 +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 1QCUU6-00089y-3q; Wed, 20 Apr 2011 10:18:10 +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 1QCUU4-0006Jn-Lb; Wed, 20 Apr 2011 10:18:08 +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 1QCURv-00066Q-2i for linux-mtd@lists.infradead.org; Wed, 20 Apr 2011 10:16:04 +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 p3KAFlpH009474 for ; Wed, 20 Apr 2011 13:15:53 +0300 Received: from eru.research.nokia.com ([[172.21.24.121]]) by mgw-sa01.nokia.com with ESMTP id p3KAFTS8009198 ; Wed, 20 Apr 2011 13:15:36 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 15/35] fs-tests: integck: make file_new return error on create failure Date: Wed, 20 Apr 2011 13:18:48 +0300 Message-Id: <1303294748-5492-16-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_061555_845950_685DA986 X-CRM114-Status: GOOD ( 10.45 ) 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_new()' to return -1 if it fails to create a file. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index f2223d4..471fcf4 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -509,23 +509,27 @@ static void dir_remove(struct dir_info *dir) free(dir); } -static struct file_info *file_new(struct dir_info *parent, const char *name) +static int file_new(struct dir_info *parent, const char *name) { - struct file_info *file = NULL; + struct file_info *file; char *path; mode_t mode; int fd; - CHECK(parent != NULL); + assert(parent != NULL); path = dir_path(parent, name); mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH; fd = open(path, O_CREAT | O_EXCL | O_RDWR, mode); if (fd == -1) { - CHECK(errno == ENOSPC); + if (errno == ENOSPC) { + full = 1; + free(path); + return 0; + } + pcv("cannot create file %s", path); free(path); - full = 1; - return NULL; + return -1; } free(path); @@ -533,10 +537,8 @@ static struct file_info *file_new(struct dir_info *parent, const char *name) file->name = dup_string(name); add_dir_entry(parent, 'f', name, file); - add_fd(file, fd); - - return file; + return 0; } static void link_new(struct dir_info *parent, const char *name, @@ -1932,7 +1934,7 @@ static int operate_on_dir(struct dir_info *dir) r = random_no(14); if (r == 0 && grow) /* When growing, 1 time in 14 create a file */ - file_new(dir, make_name(dir)); + return file_new(dir, make_name(dir)); else if (r == 1 && grow) /* When growing, 1 time in 14 create a directory */ dir_new(dir, make_name(dir));