diff options
Diffstat (limited to 'fs/ubifs/io.c')
-rw-r--r-- | fs/ubifs/io.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index 18a4b8d7c844..d82173182eeb 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c | |||
@@ -356,10 +356,9 @@ int ubifs_wbuf_sync_nolock(struct ubifs_wbuf *wbuf) | |||
356 | 356 | ||
357 | dbg_io("LEB %d:%d, %d bytes, jhead %s", | 357 | dbg_io("LEB %d:%d, %d bytes, jhead %s", |
358 | wbuf->lnum, wbuf->offs, wbuf->used, dbg_jhead(wbuf->jhead)); | 358 | wbuf->lnum, wbuf->offs, wbuf->used, dbg_jhead(wbuf->jhead)); |
359 | ubifs_assert(!(c->vfs_sb->s_flags & MS_RDONLY)); | ||
360 | ubifs_assert(!(wbuf->avail & 7)); | 359 | ubifs_assert(!(wbuf->avail & 7)); |
361 | ubifs_assert(wbuf->offs + c->min_io_size <= c->leb_size); | 360 | ubifs_assert(wbuf->offs + c->min_io_size <= c->leb_size); |
362 | ubifs_assert(!c->ro_media); | 361 | ubifs_assert(!c->ro_media && !c->ro_mount); |
363 | 362 | ||
364 | if (c->ro_error) | 363 | if (c->ro_error) |
365 | return -EROFS; | 364 | return -EROFS; |
@@ -441,7 +440,7 @@ int ubifs_bg_wbufs_sync(struct ubifs_info *c) | |||
441 | { | 440 | { |
442 | int err, i; | 441 | int err, i; |
443 | 442 | ||
444 | ubifs_assert(!c->ro_media); | 443 | ubifs_assert(!c->ro_media && !c->ro_mount); |
445 | if (!c->need_wbuf_sync) | 444 | if (!c->need_wbuf_sync) |
446 | return 0; | 445 | return 0; |
447 | c->need_wbuf_sync = 0; | 446 | c->need_wbuf_sync = 0; |
@@ -521,7 +520,7 @@ int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len) | |||
521 | ubifs_assert(!(wbuf->offs & 7) && wbuf->offs <= c->leb_size); | 520 | ubifs_assert(!(wbuf->offs & 7) && wbuf->offs <= c->leb_size); |
522 | ubifs_assert(wbuf->avail > 0 && wbuf->avail <= c->min_io_size); | 521 | ubifs_assert(wbuf->avail > 0 && wbuf->avail <= c->min_io_size); |
523 | ubifs_assert(mutex_is_locked(&wbuf->io_mutex)); | 522 | ubifs_assert(mutex_is_locked(&wbuf->io_mutex)); |
524 | ubifs_assert(!c->ro_media); | 523 | ubifs_assert(!c->ro_media && !c->ro_mount); |
525 | 524 | ||
526 | if (c->leb_size - wbuf->offs - wbuf->used < aligned_len) { | 525 | if (c->leb_size - wbuf->offs - wbuf->used < aligned_len) { |
527 | err = -ENOSPC; | 526 | err = -ENOSPC; |
@@ -666,7 +665,7 @@ int ubifs_write_node(struct ubifs_info *c, void *buf, int len, int lnum, | |||
666 | buf_len); | 665 | buf_len); |
667 | ubifs_assert(lnum >= 0 && lnum < c->leb_cnt && offs >= 0); | 666 | ubifs_assert(lnum >= 0 && lnum < c->leb_cnt && offs >= 0); |
668 | ubifs_assert(offs % c->min_io_size == 0 && offs < c->leb_size); | 667 | ubifs_assert(offs % c->min_io_size == 0 && offs < c->leb_size); |
669 | ubifs_assert(!c->ro_media); | 668 | ubifs_assert(!c->ro_media && !c->ro_mount); |
670 | 669 | ||
671 | if (c->ro_error) | 670 | if (c->ro_error) |
672 | return -EROFS; | 671 | return -EROFS; |