From patchwork Wed Apr 13 15:19:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 91048 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 111BBB70E2 for ; Thu, 14 Apr 2011 01:20:14 +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 1QA1pb-0007TB-Gd; Wed, 13 Apr 2011 15:18:11 +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 1QA1pZ-0003cS-NY; Wed, 13 Apr 2011 15:18:09 +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 1QA1nV-0003U4-3P for linux-mtd@lists.infradead.org; Wed, 13 Apr 2011 15:16:11 +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 p3DFFoZh018749 for ; Wed, 13 Apr 2011 18:15:59 +0300 Received: from eru.research.nokia.com ([[172.21.23.107]]) by mgw-sa02.nokia.com with ESMTP id p3DFFZw9018457 ; Wed, 13 Apr 2011 18:15:43 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 23/27] fs-tests: integck: do not use tests_get_total_space Date: Wed, 13 Apr 2011 18:19:03 +0300 Message-Id: <1302707947-6143-24-git-send-email-dedekind1@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1302707947-6143-1-git-send-email-dedekind1@gmail.com> References: <1302707947-6143-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-20110413_111601_972212_8749959E X-CRM114-Status: GOOD ( 10.00 ) 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) 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 Do not use the common tests_get_total_space but extend our own get_free_space function and make it return both free and total amount of space. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index 9bf42af..a53be64 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -278,12 +278,15 @@ static char *cat_paths(const char *a, const char *b) /* * Get the free space for the tested file system. */ -static uint64_t get_free_space(void) +static void get_fs_space(uint64_t *total, uint64_t *free) { struct statvfs st; CHECK(statvfs(fsinfo.mount_point, &st) == 0); - return (uint64_t)st.f_bavail * (uint64_t)st.f_frsize; + if (total) + *total = (uint64_t)st.f_blocks * (uint64_t)st.f_frsize; + if (free) + *free = (uint64_t)st.f_bavail * (uint64_t)st.f_frsize; } static char *dir_path(struct dir_info *parent, const char *name) @@ -862,7 +865,7 @@ static void file_mmap_write(struct file_info *file) if (!file->links) return; - free_space = get_free_space(); + get_fs_space(NULL, &free_space); if (!free_space) return; /* Randomly pick a written area of the file */ @@ -1939,8 +1942,7 @@ static void create_test_data(void) uint64_t total; for (i = 0; i < 10; ++i) do_an_operation(); - free = get_free_space(); - total = tests_get_total_space(); + get_fs_space(&total, &free); if ((free * 100) / total >= 10) break; } @@ -2006,8 +2008,7 @@ static void update_test_data(void) uint64_t total; for (i = 0; i < 10; ++i) do_an_operation(); - free = get_free_space(); - total = tests_get_total_space(); + get_fs_space(&total, &free); if ((free * 100) / total >= 50) break; } @@ -2281,7 +2282,8 @@ static void get_tested_fs_info(void) fsinfo.can_mmap = 0; } - for (z = get_free_space(); z >= 10; z /= 10) + get_fs_space(NULL, &z); + for (; z >= 10; z /= 10) fsinfo.log10_initial_free += 1; /* Pick the test directory name */