UBI/UBIFS: Automatically unmount UBIFS volume upon UBI partition change
PATCH v2 1/1 UBI/UBIFS: Automatically unmount UBIFS volume upon UBI partition change
Automatically unmount UBIFS partition when user changes the UBI device. Otherwise the following UBIFS commands will crash.
---
v2:
- Only try to unmount the ubifs partition if UBIFS is is really enabled. Otherwise compiling fails.
common/cmd_ubi.c | 15 +++++++++++++++ common/cmd_ubifs.c | 26 ++++++++++++++++++++------ 2 files changed, 35 insertions(+), 6 deletions(-)
common/cmd_ubi.c +15 -0
@@ -42,6 +42,11 @@ struct selected_dev {static struct selected_dev ubi_dev; +#ifdef CONFIG_CMD_UBIFS +int ubifs_is_mounted (void ); +void cmd_ubifs_umount (void ); +#endif +static void ubi_dump_vol_info (const struct ubi_volume *vol) {ubi_msg ("volume information dump:" );
@@ -472,6 +477,16 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])if (argc <3 )return cmd_usage (cmdtp); +#ifdef CONFIG_CMD_UBIFS +/* +* Automatically unmount UBIFS partition when user +* changes the UBI device. Otherwise the following +* UBIFS commands will crash. +*/ +if (ubifs_is_mounted ()) +cmd_ubifs_umount (); +#endif +/* todo: get dev number for NAND... */ ubi_dev.nr =0 ;
common/cmd_ubifs.c +20 -6
@@ -72,6 +72,25 @@ int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return 0 ; } +int ubifs_is_mounted (void ) +{ +return ubifs_mounted; +} + +void cmd_ubifs_umount (void ) +{ + +if (ubifs_sb) { +printf ("Unmounting UBIFS volume %s!\n" , + ((struct ubifs_info *)(ubifs_sb->s_fs_info))->vi.name); +ubifs_umount (ubifs_sb->s_fs_info); + } + + ubifs_sb =NULL ; + ubifs_mounted =0 ; + ubifs_initialized =0 ; +} +int do_ubifs_umount (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {if (argc !=1 )
@@ -82,12 +101,7 @@ int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return -1 ; } -if (ubifs_sb) -ubifs_umount (ubifs_sb->s_fs_info); - - ubifs_sb =NULL ; - ubifs_mounted =0 ; - ubifs_initialized =0 ; +cmd_ubifs_umount ();return 0 ; }
Signature · 1 line
1.7.3.2
PATCH v2 1/1 UBI/UBIFS: Automatically unmount UBIFS volume upon UBI partition change
Quoted 2 lines · On Friday 03 December 2010 18:23:23 Stefan Roese wrote:
Automatically unmount UBIFS partition when user changes the UBI device. Otherwise the following UBIFS commands will crash.
Applied to u-boot-ubi/master (instead of the 1st patch version).
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 at denx.de