From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/2] ubi: align ubi writes to LEB size
Date: Tue, 31 Jul 2012 21:45:11 +0200 [thread overview]
Message-ID: <1343763911-4410-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1343763911-4410-1-git-send-email-s.hauer@pengutronix.de>
Otherwise incomplete LEBs are not written.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/mtd/ubi/cdev.c | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index 6b1e432..93c3491 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -8,7 +8,7 @@
struct ubi_volume_cdev_priv {
struct ubi_device *ubi;
struct ubi_volume *vol;
- int updating;
+ int written;
};
static ssize_t ubi_volume_cdev_read(struct cdev *cdev, void *buf, size_t size,
@@ -63,13 +63,12 @@ static ssize_t ubi_volume_cdev_write(struct cdev* cdev, const void *buf,
struct ubi_device *ubi = priv->ubi;
int err;
- if (!priv->updating) {
- err = ubi_start_update(ubi, vol, 16*1024*1024);
+ if (!priv->written) {
+ err = ubi_start_update(ubi, vol, vol->used_bytes);
if (err < 0) {
printf("Cannot start volume update\n");
return err;
}
- priv->updating = 1;
}
err = ubi_more_update_data(ubi, vol, buf, size);
@@ -78,6 +77,8 @@ static ssize_t ubi_volume_cdev_write(struct cdev* cdev, const void *buf,
return err;
}
+ priv->written += size;
+
return size;
}
@@ -85,7 +86,7 @@ static int ubi_volume_cdev_open(struct cdev *cdev, unsigned long flags)
{
struct ubi_volume_cdev_priv *priv = cdev->priv;
- priv->updating = 0;
+ priv->written = 0;
return 0;
}
@@ -97,7 +98,25 @@ static int ubi_volume_cdev_close(struct cdev *cdev)
struct ubi_device *ubi = priv->ubi;
int err;
- if (priv->updating) {
+ if (priv->written) {
+ int remaining = vol->usable_leb_size -
+ (priv->written % vol->usable_leb_size);
+
+ if (remaining) {
+ void *buf = xzalloc(remaining);
+
+ memset(buf, 0xff, remaining);
+
+ err = ubi_more_update_data(ubi, vol, buf, remaining);
+
+ free(buf);
+
+ if (err < 0) {
+ printf("Couldnt or partially wrote data \n");
+ return err;
+ }
+ }
+
err = ubi_finish_update(ubi, vol);
if (err)
return err;
@@ -126,7 +145,7 @@ static loff_t ubi_volume_cdev_lseek(struct cdev *cdev, loff_t ofs)
struct ubi_volume_cdev_priv *priv = cdev->priv;
/* We can only update ubi volumes sequentially */
- if (priv->updating)
+ if (priv->written)
return -EINVAL;
return ofs;
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2012-07-31 19:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 19:45 [PATCH] UBI work Sascha Hauer
2012-07-31 19:45 ` [PATCH 1/2] ubi: cdev->write has to return the bytes read, not 0 Sascha Hauer
2012-07-31 19:45 ` 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=1343763911-4410-3-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.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