diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-14 21:01:55 (GMT) |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-14 21:01:55 (GMT) |
| commit | 8990c1bc4be46473ad19bf2fa612ca57286f3df4 (patch) | |
| tree | 3cea60576903a1d26c67e6ec62891b524d390e95 /fs/ubifs/master.c | |
| parent | 2979076fbf17a0947d6eba367b0cac19c907c160 (diff) | |
| parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
| download | linux-fsl-qoriq-8990c1bc4be46473ad19bf2fa612ca57286f3df4.tar.xz | |
Merge commit 'v2.6.37-rc1' into kbuild/kbuild
Diffstat (limited to 'fs/ubifs/master.c')
| -rw-r--r-- | fs/ubifs/master.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ubifs/master.c b/fs/ubifs/master.c index 28beaee..21f47af 100644 --- 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; |