mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: Barebox List <barebox@lists.infradead.org>
Subject: Re: [PATCH v2] environment: "wrong magic" gives the impression of an error
Date: Mon, 26 Sep 2016 08:05:15 +0200	[thread overview]
Message-ID: <20160926060515.fvyfquh74okw6rsq@pengutronix.de> (raw)
In-Reply-To: <20160922191634.GA23455@ravnborg.org>

On Thu, Sep 22, 2016 at 09:16:34PM +0200, Sam Ravnborg wrote:
> From 15e7ff689cfda27eab10aacda5c26a1ba47979ec Mon Sep 17 00:00:00 2001
> From: Sam Ravnborg <srn@skov.dk>
> Date: Thu, 22 Sep 2016 06:54:42 +0200
> Subject: [PATCH 1/1] environment: "wrong magic" give the impression of an
>  error
> 
> Introduce a more soft wording when the magic of
> the superblock does not match.
> Include a hint to the typical reason "(envfs never written?)"
> 
> This prevents a "what is wrong?" moment when looking at
> the boot log.
> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> ---

Applied, thanks

Sascha

> 
> v2:
> Dropped change in envfs_load_data(). envfs_load_data() is used
> to traverse the inodes and if we reach this far we
> have encountered a real error which should be reported.
> Thanks to Sascha for spottign this mistake!
> 
> 	Sam
> 
>  common/environment.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/environment.c b/common/environment.c
> index db127d7..c9cef63 100644
> --- a/common/environment.c
> +++ b/common/environment.c
> @@ -382,7 +382,7 @@ EXPORT_SYMBOL(envfs_save);
>  static int envfs_check_super(struct envfs_super *super, size_t *size)
>  {
>  	if (ENVFS_32(super->magic) != ENVFS_MAGIC) {
> -		printf("envfs: wrong magic\n");
> +		printf("envfs: no envfs (magic mismatch) - envfs newer written?\n");
>  		return -EIO;
>  	}
>  
> -- 
> 1.8.3.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2016-09-26  6:05 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-22  5:00 [PATCH] environment: "wrong magic" give " Sam Ravnborg
2016-09-22  8:08 ` Sascha Hauer
2016-09-22 19:16   ` [PATCH v2] environment: "wrong magic" gives " Sam Ravnborg
2016-09-26  6:05     ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160926060515.fvyfquh74okw6rsq@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=sam@ravnborg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox