projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[cascardo/linux.git]
/
fs
/
ubifs
/
master.c
diff --git
a/fs/ubifs/master.c
b/fs/ubifs/master.c
index
28beaee
..
21f47af
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;