Patchwork [U-Boot,2/4] UBIFS: Add ubifsumount command to unmount an active volume

login
register
mail settings
Submitter Stefan Roese
Date Oct. 28, 2010, 12:09 p.m.
Message ID <1288267762-1030-1-git-send-email-sr@denx.de>
Download mbox | patch
Permalink /patch/71949/
State Accepted
Commit cb9c09d4871015be5710c7bae29b06218ddc3509
Delegated to: Stefan Roese
Headers show

Comments

Stefan Roese - Oct. 28, 2010, 12:09 p.m.
This new ubifsumount command allows the user to unmount a previously
mounted UBIFS volume.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 common/cmd_ubifs.c |   31 +++++++++++++++++++++++++++++++
 fs/ubifs/super.c   |    2 +-
 2 files changed, 32 insertions(+), 1 deletions(-)
Ben Gardiner - Oct. 29, 2010, 2 p.m.
On Thu, Oct 28, 2010 at 8:09 AM, Stefan Roese <sr@denx.de> wrote:
> This new ubifsumount command allows the user to unmount a previously
> mounted UBIFS volume.
>
> Signed-off-by: Stefan Roese <sr@denx.de>

Applies to 908614f20f7f0f5df736eed21b88e81ebbf14e86 of
git://git.denx.de/u-boot.git.

Two checkpatch warnings:

WARNING: externs should be avoided in .c files
#92: FILE: common/cmd_ubifs.c:41:
+extern struct super_block *ubifs_sb;

WARNING: externs should be avoided in .c files
#97: FILE: common/cmd_ubifs.c:46:
+void ubifs_umount(struct ubifs_info *c);

total: 0 errors, 2 warnings, 63 lines checked

Tested on da850evm with NAND, env.oob enabled. I was able to
ubifumount after a ubifsload.

Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>

Best Regards,
Ben Gardiner

---
Nanometrics Inc.
http://www.nanometrics.ca
Stefan Roese - Dec. 3, 2010, 3:51 p.m.
On Thursday 28 October 2010 14:09:22 Stefan Roese wrote:
> This new ubifsumount command allows the user to unmount a previously
> mounted UBIFS volume.

Applied to u-boot-ubi/master. Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de

Patch

diff --git a/common/cmd_ubifs.c b/common/cmd_ubifs.c
index a0ec184..30b23d3 100644
--- a/common/cmd_ubifs.c
+++ b/common/cmd_ubifs.c
@@ -33,12 +33,17 @@ 
 #include <config.h>
 #include <command.h>
 
+#include "../fs/ubifs/ubifs.h"
+
 static int ubifs_initialized;
 static int ubifs_mounted;
 
+extern struct super_block *ubifs_sb;
+
 /* Prototypes */
 int ubifs_init(void);
 int ubifs_mount(char *vol_name);
+void ubifs_umount(struct ubifs_info *c);
 int ubifs_ls(char *dir_name);
 int ubifs_load(char *filename, u32 addr, u32 size);
 
@@ -67,6 +72,26 @@  int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	return 0;
 }
 
+int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+	if (argc != 1)
+		return cmd_usage(cmdtp);
+
+	if (ubifs_initialized == 0) {
+		printf("No UBIFS volume mounted!\n");
+		return -1;
+	}
+
+	if (ubifs_sb)
+		ubifs_umount(ubifs_sb->s_fs_info);
+
+	ubifs_sb = NULL;
+	ubifs_mounted = 0;
+	ubifs_initialized = 0;
+
+	return 0;
+}
+
 int do_ubifs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	char *filename = "/";
@@ -132,6 +157,12 @@  U_BOOT_CMD(
 );
 
 U_BOOT_CMD(
+	ubifsumount, 1, 0, do_ubifs_umount,
+	"unmount UBIFS volume",
+	"    - unmount current volume"
+);
+
+U_BOOT_CMD(
 	ubifsls, 2, 0, do_ubifs_ls,
 	"list files in a directory",
 	"[directory]\n"
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 39e3efe..63b2164 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -824,7 +824,7 @@  out_free:
  * through mounting (error path cleanup function). So it has to make sure the
  * resource was actually allocated before freeing it.
  */
-static void ubifs_umount(struct ubifs_info *c)
+void ubifs_umount(struct ubifs_info *c)
 {
 	dbg_gen("un-mounting UBI device %d, volume %d", c->vi.ubi_num,
 		c->vi.vol_id);