[LTP] [PATCH] mount/mount05.c: format the device when necessary

[LTP] [PATCH] mount/mount05.c: format the device when necessary

[DAN LI]

Format the device only when "-D device" & "-T type" are specified.

Signed-off-by: DAN LI <li.dan@cn.fujitsu.com>
---
 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

Re: [LTP] [PATCH] mount/mount05.c: format the device when necessary

[Wanlong Gao]

On 08/26/2013 02:08 PM, DAN LI wrote:
> 
> Format the device only when "-D device" & "-T type" are specified.
> 
> Signed-off-by: DAN LI <li.dan@cn.fujitsu.com>
> ---
>  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) {

If "-T" option is not specified, the default fs_type is "ext2",
then we can also format the device.

> +		tst_mkfs(NULL, device, fstype, NULL);

And here "fstype" should be changed to "fs_type", right?

Thanks,
Wanlong Gao

> +
>  		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");
> 


------------------------------------------------------------------------------
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