From: Richard Weinberger <richard@nod.at>
To: dedekind1@gmail.com
Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 5/6] UBI: Fastmap: Fix fastmap usage in ubi_volume_notify()
Date: Sun, 30 Nov 2014 12:35:39 +0100 [thread overview]
Message-ID: <1417347340-6872-6-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1417347340-6872-1-git-send-email-richard@nod.at>
There is no need to switch to ro mode if ubi_update_fastmap() fails.
Also get rid of the ifdef.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
drivers/mtd/ubi/build.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 3405be4..3152331 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -154,23 +154,22 @@ static struct device_attribute dev_mtd_num =
*/
int ubi_volume_notify(struct ubi_device *ubi, struct ubi_volume *vol, int ntype)
{
+ int ret;
struct ubi_notification nt;
ubi_do_get_device_info(ubi, &nt.di);
ubi_do_get_volume_info(ubi, vol, &nt.vi);
-#ifdef CONFIG_MTD_UBI_FASTMAP
switch (ntype) {
case UBI_VOLUME_ADDED:
case UBI_VOLUME_REMOVED:
case UBI_VOLUME_RESIZED:
case UBI_VOLUME_RENAMED:
- if (ubi_update_fastmap(ubi)) {
- ubi_err(ubi, "Unable to update fastmap!");
- ubi_ro_mode(ubi);
- }
+ ret = ubi_update_fastmap(ubi);
+ if (ret)
+ ubi_msg(ubi, "Unable to write a new fastmap: %i", ret);
}
-#endif
+
return blocking_notifier_call_chain(&ubi_notifiers, ntype, &nt);
}
--
1.8.4.5
next prev parent reply other threads:[~2014-11-30 11:36 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-30 11:35 Fastmap update v2 (pile 2) Richard Weinberger
2014-11-30 11:35 ` [PATCH 1/6] UBI: Fastmap: Fix memory leaks while closing the WL sub-system Richard Weinberger
2014-12-07 8:13 ` Tanya Brokhman
2014-12-07 9:54 ` Richard Weinberger
2014-12-07 11:32 ` Tanya Brokhman
2014-12-07 11:34 ` Richard Weinberger
2014-12-07 13:26 ` Tanya Brokhman
2014-12-07 13:46 ` Richard Weinberger
2014-12-17 20:01 ` Guido Martínez
2014-11-30 11:35 ` [PATCH 2/6] UBI: Fastmap: Don't allocate new ubi_wl_entry objects Richard Weinberger
2014-12-07 13:49 ` Tanya Brokhman
2014-12-08 8:36 ` Tanya Brokhman
2014-12-08 9:14 ` Richard Weinberger
2014-12-08 9:37 ` Tanya Brokhman
2014-12-08 9:39 ` Richard Weinberger
2014-12-18 1:18 ` Guido Martínez
2014-12-18 1:21 ` Richard Weinberger
2014-11-30 11:35 ` [PATCH 3/6] UBI: Fastmap: Notify user in case of an ubi_update_fastmap() failure Richard Weinberger
2014-12-07 13:59 ` Tanya Brokhman
2014-12-07 14:22 ` Richard Weinberger
2014-12-08 6:58 ` Tanya Brokhman
2014-12-08 9:11 ` Richard Weinberger
2014-12-08 13:00 ` Tanya Brokhman
2014-12-08 13:07 ` Richard Weinberger
2014-12-08 13:20 ` Richard Weinberger
2014-11-30 11:35 ` [PATCH 4/6] UBI: Fastmap: Wrap fastmap specific function in a ifdef Richard Weinberger
2014-12-07 14:05 ` Tanya Brokhman
2014-11-30 11:35 ` Richard Weinberger [this message]
2014-12-07 14:06 ` [PATCH 5/6] UBI: Fastmap: Fix fastmap usage in ubi_volume_notify() Tanya Brokhman
2014-11-30 11:35 ` [PATCH 6/6] UBI: Fastmap: Fix memory leak while attaching Richard Weinberger
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=1417347340-6872-6-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=dedekind1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@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
all inboxes | Powered by JetHome®