From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1VDpwO-0000qn-E3 for ltp-list@lists.sourceforge.net; Mon, 26 Aug 2013 06:06:16 +0000 Received: from [222.73.24.84] (helo=song.cn.fujitsu.com) by sog-mx-3.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1VDpwM-0005tf-U6 for ltp-list@lists.sourceforge.net; Mon, 26 Aug 2013 06:06:16 +0000 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r7Q65lsT015513 for ; Mon, 26 Aug 2013 14:05:47 +0800 Message-ID: <521AF0C8.6020704@cn.fujitsu.com> Date: Mon, 26 Aug 2013 14:08:08 +0800 From: DAN LI MIME-Version: 1.0 Subject: [LTP] [PATCH] mount/mount05.c: format the device when necessary List-Id: Linux Test Project General Discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-list-bounces@lists.sourceforge.net To: LTP list Format the device only when "-D device" & "-T type" are specified. Signed-off-by: DAN LI --- testcases/kernel/syscalls/mount/mount05.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testcases/kernel/syscalls/mount/mount05.c b/testcases/kernel/syscalls/mount/mount05.c index 4b2a07c..b4be67b 100644 --- a/testcases/kernel/syscalls/mount/mount05.c +++ b/testcases/kernel/syscalls/mount/mount05.c @@ -113,7 +113,6 @@ int main(int argc, char *argv[]) void setup(void) { tst_require_root(NULL); - tst_mkfs(NULL, device, fstype, NULL); tst_sig(NOFORK, DEF_HANDLER, cleanup); @@ -122,9 +121,12 @@ void setup(void) SAFE_MKDIR(cleanup, mntpoint_src, DIR_MODE); SAFE_MKDIR(cleanup, mntpoint_des, DIR_MODE); - if (dflag && tflag) + if (dflag && tflag) { + tst_mkfs(NULL, device, fstype, NULL); + if (mount(device, mntpoint_src, fs_type, 0, NULL) == -1) tst_brkm(TBROK | TERRNO, cleanup, "mount failed"); + } SAFE_FILE_PRINTF(cleanup, file_src, "TEST FILE"); -- 1.8.1 ------------------------------------------------------------------------------ Introducing Performance Central, a new site from SourceForge and AppDynamics. Performance Central is your source for news, insights, analysis and resources for efficient Application Performance Management. Visit us today! http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list