All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patrick Delaunay <patrick.delaunay@st.com>
To: u-boot@lists.denx.de
Subject: [PATCH v4 12/14] env: ext4: introduce new function env_ext4_save_buffer
Date: Tue, 28 Jul 2020 11:51:25 +0200	[thread overview]
Message-ID: <20200728095128.2363-13-patrick.delaunay@st.com> (raw)
In-Reply-To: <20200728095128.2363-1-patrick.delaunay@st.com>

Split the function env_ext4_save to prepare the erase support.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---

(no changes since v1)

 env/ext4.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/env/ext4.c b/env/ext4.c
index ac9f126bec..0a10a5e050 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -44,9 +44,8 @@ __weak const char *env_ext4_get_dev_part(void)
 	return (const char *)CONFIG_ENV_EXT4_DEVICE_AND_PART;
 }
 
-static int env_ext4_save(void)
+static int env_ext4_save_buffer(env_t *env_new)
 {
-	env_t	env_new;
 	struct blk_desc *dev_desc = NULL;
 	struct disk_partition info;
 	int dev, part;
@@ -54,10 +53,6 @@ static int env_ext4_save(void)
 	const char *ifname = env_ext4_get_intf();
 	const char *dev_and_part = env_ext4_get_dev_part();
 
-	err = env_export(&env_new);
-	if (err)
-		return err;
-
 	part = blk_get_device_part_str(ifname, dev_and_part,
 				       &dev_desc, &info, 1);
 	if (part < 0)
@@ -72,7 +67,7 @@ static int env_ext4_save(void)
 		return 1;
 	}
 
-	err = ext4fs_write(CONFIG_ENV_EXT4_FILE, (void *)&env_new,
+	err = ext4fs_write(CONFIG_ENV_EXT4_FILE, (void *)env_new,
 			   sizeof(env_t), FILETYPE_REG);
 	ext4fs_close();
 
@@ -81,9 +76,26 @@ static int env_ext4_save(void)
 			CONFIG_ENV_EXT4_FILE, ifname, dev, part);
 		return 1;
 	}
-	gd->env_valid = ENV_VALID;
 
+	return 0;
+}
+
+static int env_ext4_save(void)
+{
+	env_t env_new;
+	int err;
+
+	err = env_export(&env_new);
+	if (err)
+		return err;
+
+	err = env_ext4_save_buffer(&env_new);
+	if (err)
+		return err;
+
+	gd->env_valid = ENV_VALID;
 	puts("done\n");
+
 	return 0;
 }
 
-- 
2.17.1

  parent reply	other threads:[~2020-07-28  9:51 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-28  9:51 [PATCH v4 00/14] env: ext4: corrections and add test for env in ext4 Patrick Delaunay
2020-07-28  9:51 ` [PATCH v4 01/14] env: add absolute path at CONFIG_ENV_EXT4_FILE Patrick Delaunay
2020-07-31 21:40   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 02/14] env: ext4: set gd->env_valid Patrick Delaunay
2020-07-31 21:40   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 03/14] env: sf: avoid space in backend name Patrick Delaunay
2020-07-31 21:40   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 04/14] env: correctly handle env_load_prio Patrick Delaunay
2020-07-31 21:40   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 05/14] env: nowhere: add .load ops Patrick Delaunay
2020-07-31 21:41   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 06/14] env: the ops driver load becomes mandatory in struct env_driver Patrick Delaunay
2020-07-31 21:41   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 07/14] cmd: env: add env load command Patrick Delaunay
2020-07-31 21:41   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 08/14] cmd: env: add env select command Patrick Delaunay
2020-07-31 21:41   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 09/14] configs: sandbox: activate env in ext4 support Patrick Delaunay
2020-07-31 21:41   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 10/14] configs: sandbox: activate command env select and env load Patrick Delaunay
2020-07-31 21:41   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 11/14] test: environment in ext4 Patrick Delaunay
2020-07-31 21:41   ` Tom Rini
2020-08-03 15:43   ` Stephen Warren
2020-08-03 15:51     ` Tom Rini
2020-08-03 16:57       ` Stephen Warren
2020-08-03 17:11         ` Tom Rini
2020-07-28  9:51 ` Patrick Delaunay [this message]
2020-07-31 21:41   ` [PATCH v4 12/14] env: ext4: introduce new function env_ext4_save_buffer Tom Rini
2020-07-28  9:51 ` [PATCH v4 13/14] env: ext4: add support of command env erase Patrick Delaunay
2020-07-31 21:41   ` Tom Rini
2020-07-28  9:51 ` [PATCH v4 14/14] test: sandbox: add test for erase command Patrick Delaunay
2020-07-31 21:42   ` Tom Rini

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=20200728095128.2363-13-patrick.delaunay@st.com \
    --to=patrick.delaunay@st.com \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.