From patchwork Sun Apr 24 16:16:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 92665 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 3A019B6F1B for ; Mon, 25 Apr 2011 02:14:27 +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 1QE1w1-000565-Tf; Sun, 24 Apr 2011 16:13:22 +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 1QE1w0-00031w-5I; Sun, 24 Apr 2011 16:13:20 +0000 Received: from smtp.nokia.com ([147.243.1.48] helo=mgw-sa02.nokia.com) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QE1vi-0002zj-W2 for linux-mtd@lists.infradead.org; Sun, 24 Apr 2011 16:13:05 +0000 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa02.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id p3OGD0Ne010309 for ; Sun, 24 Apr 2011 19:13:00 +0300 Received: from eru.research.nokia.com ([[172.21.24.121]]) by mgw-sa02.nokia.com with ESMTP id p3OGCbfE010118 ; Sun, 24 Apr 2011 19:12:38 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 1/5] fs-tests: integck: introduce a helper for checking Date: Sun, 24 Apr 2011 19:16:14 +0300 Message-Id: <1303661778-13214-2-git-send-email-dedekind1@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1303661778-13214-1-git-send-email-dedekind1@gmail.com> References: <1303661778-13214-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-20110424_121303_420527_EF028853 X-CRM114-Status: GOOD ( 10.33 ) 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.48 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 Introduce a 'check_tested_fs()' helper function. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index 63f6956..52433ba 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -2505,6 +2505,13 @@ static int remount_tested_fs(void) return 0; } +static void check_tested_fs(void) +{ + check_run_no += 1; + dir_check(top_dir); + check_deleted_files(); +} + /* * Perform the test. Returns zero on success and -1 on failure. */ @@ -2543,9 +2550,7 @@ static int integck(void) assert(!args.power_cut_mode); /* Check everything */ - check_run_no += 1; - dir_check(top_dir); - check_deleted_files(); + check_tested_fs(); for (rpt = 0; args.repeat_cnt == 0 || rpt < args.repeat_cnt; ++rpt) { ret = update_test_data(); @@ -2560,9 +2565,7 @@ static int integck(void) } /* Check everything */ - check_run_no += 1; - dir_check(top_dir); - check_deleted_files(); + check_tested_fs(); } /* Tidy up by removing everything */