From patchwork Thu Mar 24 13:48:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 88198 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 37A0EB6F93 for ; Fri, 25 Mar 2011 00:47:19 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1Q2krM-0000mw-7u; Thu, 24 Mar 2011 13:45:56 +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 1Q2krK-0008WF-Q6; Thu, 24 Mar 2011 13:45:54 +0000 Received: from smtp.nokia.com ([147.243.128.26] helo=mgw-da02.nokia.com) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1Q2krH-0008Vw-Ld for linux-mtd@lists.infradead.org; Thu, 24 Mar 2011 13:45:52 +0000 Received: from nokia.com (localhost [127.0.0.1]) by mgw-da02.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id p2ODjos1008931 for ; Thu, 24 Mar 2011 15:45:50 +0200 Received: from eru.research.nokia.com ([[172.21.24.37]]) by mgw-da02.nokia.com with ESMTP id p2ODjco4008709 ; Thu, 24 Mar 2011 15:45:42 +0200 From: Artem Bityutskiy To: MTD list Subject: [PATCH] fs-tests: integck: improve re-mounting test coverage Date: Thu, 24 Mar 2011 15:48:41 +0200 Message-Id: <1300974521-9101-1-git-send-email-dedekind1@gmail.com> X-Mailer: git-send-email 1.7.2.3 X-Nokia-AV: Clean X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110324_094551_960860_C92BC0BF X-CRM114-Status: GOOD ( 11.99 ) 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.128.26 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 The integck tests re-mounts the file-system from time to time and checks the integrity afterwords. And it re-mounts always the same-way: unmount and then mount R/W back. However, it is better to do it differently some times, e.g.: * re-mount R/O then re-mount R/W * unmount then mount R/W * both of the above * unmount, mount R/O, then re-mount R/W * etc. This will give better test coverage. This patch does exactly that by improving the 'tests_remount()' function. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/lib/tests.c | 84 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 76 insertions(+), 8 deletions(-) diff --git a/tests/fs-tests/lib/tests.c b/tests/fs-tests/lib/tests.c index 587eda8..00b94f9 100644 --- a/tests/fs-tests/lib/tests.c +++ b/tests/fs-tests/lib/tests.c @@ -1049,26 +1049,39 @@ out_mem: return 1; } -/* Un-mount and re-mount test file system */ +/* + * Re-mount test file system. Randomly choose how to do this: re-mount R/O then + * re-mount R/W, or unmount, then mount R/W, or unmount then mount R/O then + * re-mount R/W, etc. This should improve test coverage. + */ void tests_remount(void) { + int err; struct mntent mount_info; - char *source; - char *target; - char *filesystemtype; - unsigned long mountflags; - char *data; + char *source, *target, *filesystemtype, *data; char cwd[4096]; + unsigned long mountflags, flags; + unsigned int rorw1, um, um_ro, um_rorw, rorw2; CHECK(tests_get_mount_info(&mount_info)); if (strcmp(mount_info.mnt_dir,"/") == 0) return; + /* Save current working directory */ CHECK(getcwd(cwd, 4096) != NULL); + /* Temporarily change working directory to '/' */ CHECK(chdir("/") != -1); - CHECK(umount(tests_file_system_mount_dir) != -1); + /* Choose what to do */ + rorw1 = tests_random_no(2); + um = tests_random_no(2); + um_ro = tests_random_no(2); + um_rorw = tests_random_no(2); + rorw2 = tests_random_no(2); + + if (rorw1 + um + rorw2 == 0) + um = 1; source = mount_info.mnt_fsname; target = tests_file_system_mount_dir; @@ -1076,7 +1089,62 @@ void tests_remount(void) data = mount_info.mnt_opts; process_mount_options(&data, &mountflags); - CHECK(mount(source, target, filesystemtype, mountflags, data) != -1); + if (rorw1) { + /* Re-mount R/O and then re-mount R/W */ + flags = mountflags | MS_RDONLY | MS_REMOUNT; + err = mount(source, target, filesystemtype, flags, data); + CHECK(err != -1); + + flags = mountflags | MS_REMOUNT; + flags &= ~((unsigned long)MS_RDONLY); + err = mount(source, target, filesystemtype, flags, data); + CHECK(err != -1); + } + + if (um) { + /* Unmount and mount */ + if (um_ro) { + /* But re-mount R/O before unmounting */ + flags = mountflags | MS_RDONLY | MS_REMOUNT; + err = mount(source, target, filesystemtype, + flags, data); + CHECK(err != -1); + } + + CHECK(umount(target) != -1); + + if (!um_rorw) { + /* Mount R/W straight away */ + err = mount(source, target, filesystemtype, + mountflags, data); + CHECK(err != -1); + } else { + /* Mount R/O and then re-mount R/W */ + err = mount(source, target, filesystemtype, + mountflags | MS_RDONLY, data); + CHECK(err != -1); + + flags = mountflags | MS_REMOUNT; + flags &= ~((unsigned long)MS_RDONLY); + err = mount(source, target, filesystemtype, + flags, data); + CHECK(err != -1); + } + } + + if (rorw2) { + /* Re-mount R/O and then re-mount R/W */ + flags = mountflags | MS_RDONLY | MS_REMOUNT; + err = mount(source, target, filesystemtype, flags, data); + CHECK(err != -1); + + flags = mountflags | MS_REMOUNT; + flags &= ~((unsigned long)MS_RDONLY); + err = mount(source, target, filesystemtype, flags, data); + CHECK(err != -1); + } + + /* Restore the previous working directory */ CHECK(chdir(cwd) != -1); }