diff options
| -rw-r--r-- | fs/ubifs/super.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 0f029e1732d1..e94d9628a49e 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1643,15 +1643,27 @@ static int ubifs_remount_rw(struct ubifs_info *c) if (err) goto out; + dbg_gen("re-mounted read-write"); + c->remounting_rw = 0; + if (c->need_recovery) { c->need_recovery = 0; ubifs_msg("deferred recovery completed"); + } else { + /* + * Do not run the debugging space check if the were doing + * recovery, because when we saved the information we had the + * file-system in a state where the TNC and lprops has been + * modified in memory, but all the I/O operations (including a + * commit) were deferred. So the file-system was in + * "non-committed" state. Now the file-system is in committed + * state, and of course the amount of free space will change + * because, for example, the old index size was imprecise. + */ + err = dbg_check_space_info(c); } - dbg_gen("re-mounted read-write"); - c->remounting_rw = 0; c->always_chk_crc = 0; - err = dbg_check_space_info(c); mutex_unlock(&c->umount_mutex); return err; |