From patchwork Wed Apr 20 10:18:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 92186 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 0565AB6FD7 for ; Wed, 20 Apr 2011 20:23:23 +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 1QCUVC-0001Nz-5p; Wed, 20 Apr 2011 10:19:18 +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 1QCUVA-0006PT-I5; Wed, 20 Apr 2011 10:19:16 +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 1QCURy-00068o-Fa for linux-mtd@lists.infradead.org; Wed, 20 Apr 2011 10:16:12 +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 p3KAFlpK009474 for ; Wed, 20 Apr 2011 13:15:57 +0300 Received: from eru.research.nokia.com ([[172.21.24.121]]) by mgw-sa01.nokia.com with ESMTP id p3KAFTSH009198 ; Wed, 20 Apr 2011 13:15:44 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 24/35] fs-tests: integck: make operate_on_entry handle all errors Date: Wed, 20 Apr 2011 13:18:57 +0300 Message-Id: <1303294748-5492-25-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_061559_048303_D4958512 X-CRM114-Status: GOOD ( 13.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 Make 'operate_on_entry()' handle handle errors from all functions it calls and return the error code to the caller. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 44 ++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index f99caae..c3c3813 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -1881,27 +1881,27 @@ static int symlink_remove(struct symlink_info *symlink) static int operate_on_dir(struct dir_info *dir); /* Randomly select something to do with a file */ -static void operate_on_file(struct file_info *file) +static int operate_on_file(struct file_info *file) { /* Try to keep at least 10 files open */ if (open_files_count < 10) { file_open(file); - return; + return 0; } /* Try to keep about 20 files open */ if (open_files_count < 20 && random_no(2) == 0) { file_open(file); - return; + return 0; } /* Try to keep up to 40 files open */ if (open_files_count < 40 && random_no(20) == 0) { file_open(file); - return; + return 0; } /* Occasionly truncate */ if (shrink && random_no(100) == 0) { file_truncate_file(file); - return; + return 0; } /* Mostly just write */ file_write_file(file); @@ -1918,38 +1918,40 @@ static void operate_on_file(struct file_info *file) file_check(file, fd); } } + return 0; } /* Randomly select something to do with a directory entry */ static int operate_on_entry(struct dir_entry_info *entry) { + int ret = 0; + /* 1 time in 1000 rename */ if (random_no(1000) == 0) - return rename_entry(entry); - if (entry->type == 's') { + ret = rename_entry(entry); + else if (entry->type == 's') { symlink_check(entry->symlink); /* If shrinking, 1 time in 50, remove a symlink */ if (shrink && random_no(50) == 0) - return symlink_remove(entry->symlink); - return 0; - } - if (entry->type == 'd') { + ret = symlink_remove(entry->symlink); + } else if (entry->type == 'd') { /* If shrinking, 1 time in 50, remove a directory */ if (shrink && random_no(50) == 0) - return dir_remove(entry->dir); - return operate_on_dir(entry->dir); - } - if (entry->type == 'f') { + ret = dir_remove(entry->dir); + else + ret = operate_on_dir(entry->dir); + } else if (entry->type == 'f') { /* If shrinking, 1 time in 10, remove a file */ if (shrink && random_no(10) == 0) - return file_delete(entry->file); + ret = file_delete(entry->file); /* If not growing, 1 time in 10, unlink a file with links > 1 */ - if (!grow && entry->file->link_count > 1 && - random_no(10) == 0) - return file_unlink_file(entry->file); - operate_on_file(entry->file); + else if (!grow && entry->file->link_count > 1 && + random_no(10) == 0) + ret = file_unlink_file(entry->file); + else + ret = operate_on_file(entry->file); } - return 0; + return ret; } /*