Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1619670 > unrolled thread

[PATCH v1 1/3] UBIFS: parse iversion mount option

Back to article view | Back to linux.kernel

Contents

  [PATCH v1 1/3] UBIFS: parse iversion mount option Oleksij Rempel <o.rempel@pengutronix.de> - 2017-04-10 09:00 +0200
    [PATCH v1 3/3] fs: ubifs: set s_uuid in super block Oleksij Rempel <o.rempel@pengutronix.de> - 2017-04-10 09:00 +0200
    Re: [PATCH v1 1/3] UBIFS: parse iversion mount option Oleksij Rempel <ore@pengutronix.de> - 2017-04-10 09:50 +0200

#1619670 — [PATCH v1 1/3] UBIFS: parse iversion mount option

From: Steffen Trumtrar <s.trumtrar@pengutronix.de>

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 fs/ubifs/super.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index b73811bd7676..61180bee38b4 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -931,6 +931,7 @@ enum {
 	Opt_chk_data_crc,
 	Opt_no_chk_data_crc,
 	Opt_override_compr,
+	Opt_i_version,
 	Opt_err,
 };
 
@@ -942,6 +943,7 @@ static const match_table_t tokens = {
 	{Opt_chk_data_crc, "chk_data_crc"},
 	{Opt_no_chk_data_crc, "no_chk_data_crc"},
 	{Opt_override_compr, "compr=%s"},
+	{Opt_i_version, "iversion"},
 	{Opt_err, NULL},
 };
 
@@ -986,6 +988,8 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options,
 		return 0;
 
 	while ((p = strsep(&options, ","))) {
+		struct super_block *sb = c->vfs_sb;
+		unsigned long flag;
 		int token;
 
 		if (!*p)
@@ -1042,11 +1046,11 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options,
 			c->default_compr = c->mount_opts.compr_type;
 			break;
 		}
+		case Opt_i_version:
+			sb->s_flags |= MS_I_VERSION;
+			break;
 		default:
 		{
-			unsigned long flag;
-			struct super_block *sb = c->vfs_sb;
-
 			flag = parse_standard_option(p);
 			if (!flag) {
 				ubifs_err(c, "unrecognized mount option \"%s\" or missing value",
-- 
2.11.0

[toc] | [next] | [standalone]

#1619671 — [PATCH v1 3/3] fs: ubifs: set s_uuid in super block

From: Steffen Trumtrar <s.trumtrar@pengutronix.de>

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 fs/ubifs/super.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 76e44ab88065..3cf2e0347595 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2075,6 +2075,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
 		err = -ENOMEM;
 		goto out_umount;
 	}
+	memcpy(&sb->s_uuid, &c->uuid, sizeof(c->uuid));
 
 	mutex_unlock(&c->umount_mutex);
 	return 0;
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1619686

please ignore this patch. It need to be updated.

On 04/10/2017 08:53 AM, Oleksij Rempel wrote:
> From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
>  fs/ubifs/super.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
> index b73811bd7676..61180bee38b4 100644
> --- a/fs/ubifs/super.c
> +++ b/fs/ubifs/super.c
> @@ -931,6 +931,7 @@ enum {
>  	Opt_chk_data_crc,
>  	Opt_no_chk_data_crc,
>  	Opt_override_compr,
> +	Opt_i_version,
>  	Opt_err,
>  };
>
> @@ -942,6 +943,7 @@ static const match_table_t tokens = {
>  	{Opt_chk_data_crc, "chk_data_crc"},
>  	{Opt_no_chk_data_crc, "no_chk_data_crc"},
>  	{Opt_override_compr, "compr=%s"},
> +	{Opt_i_version, "iversion"},
>  	{Opt_err, NULL},
>  };
>
> @@ -986,6 +988,8 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options,
>  		return 0;
>
>  	while ((p = strsep(&options, ","))) {
> +		struct super_block *sb = c->vfs_sb;
> +		unsigned long flag;
>  		int token;
>
>  		if (!*p)
> @@ -1042,11 +1046,11 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options,
>  			c->default_compr = c->mount_opts.compr_type;
>  			break;
>  		}
> +		case Opt_i_version:
> +			sb->s_flags |= MS_I_VERSION;
> +			break;
>  		default:
>  		{
> -			unsigned long flag;
> -			struct super_block *sb = c->vfs_sb;
> -
>  			flag = parse_standard_option(p);
>  			if (!flag) {
>  				ubifs_err(c, "unrecognized mount option \"%s\" or missing value",
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web