Merge branch 'master' into csb1725

[mv-sheeva.git] / fs / ubifs / misc.h

diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h
index 4fa81d867e4107cc726074a78762abb5f681ca63..c3de04dc952a5c735428f73ad53c3ad40cf3dc4e 100644 (file)
--- a/fs/ubifs/misc.h
+++ b/fs/ubifs/misc.h
@@ -132,7 +132,8 @@ static inline int ubifs_leb_unmap(const struct ubifs_info *c, int lnum)
 {
        int err;
 
-       if (c->ro_media)
+       ubifs_assert(!c->ro_media && !c->ro_mount);
+       if (c->ro_error)
                return -EROFS;
        err = ubi_leb_unmap(c->ubi, lnum);
        if (err) {
@@ -159,7 +160,8 @@ static inline int ubifs_leb_write(const struct ubifs_info *c, int lnum,
 {
        int err;
 
-       if (c->ro_media)
+       ubifs_assert(!c->ro_media && !c->ro_mount);
+       if (c->ro_error)
                return -EROFS;
        err = ubi_leb_write(c->ubi, lnum, buf, offs, len, dtype);
        if (err) {
@@ -186,7 +188,8 @@ static inline int ubifs_leb_change(const struct ubifs_info *c, int lnum,
 {
        int err;
 
-       if (c->ro_media)
+       ubifs_assert(!c->ro_media && !c->ro_mount);
+       if (c->ro_error)
                return -EROFS;
        err = ubi_leb_change(c->ubi, lnum, buf, len, dtype);
        if (err) {