Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / ubifs / master.c

diff --git a/fs/ubifs/master.c b/fs/ubifs/master.c
index 28beaeedadc07d5ad7c3c312d27e30d7be01ee64..21f47afdacff170b5241d69e00edbb6fb3e0ae4b 100644 (file)
--- a/fs/ubifs/master.c
+++ b/fs/ubifs/master.c
@@ -361,7 +361,8 @@ int ubifs_write_master(struct ubifs_info *c)
 {
        int err, lnum, offs, len;
 
-       if (c->ro_media)
+       ubifs_assert(!c->ro_media && !c->ro_mount);
+       if (c->ro_error)
                return -EROFS;
 
        lnum = UBIFS_MST_LNUM;