X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Fubifs%2Flog.c;h=3e0aa7367556903e4f41f416443f92fa8cdab228;hb=a75952b72a0fff3031124003e62118111aed42c1;hp=36857b9ed59e089c793f26098aecf820275c6959;hpb=1e51764a3c2ac05a23a22b2a95ddee4d9bffb16d;p=safe%2Fjmp%2Flinux-2.6 diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c index 36857b9..3e0aa73 100644 --- a/fs/ubifs/log.c +++ b/fs/ubifs/log.c @@ -317,6 +317,8 @@ int ubifs_add_bud_to_log(struct ubifs_info *c, int jhead, int lnum, int offs) return 0; out_unlock: + if (err != -EAGAIN) + ubifs_ro_mode(c, err); mutex_unlock(&c->log_mutex); kfree(ref); kfree(bud); @@ -410,7 +412,7 @@ int ubifs_log_start_commit(struct ubifs_info *c, int *ltail_lnum) return -ENOMEM; cs->ch.node_type = UBIFS_CS_NODE; - cs->cmt_no = cpu_to_le64(c->cmt_no + 1); + cs->cmt_no = cpu_to_le64(c->cmt_no); ubifs_prepare_node(c, cs, UBIFS_CS_NODE_SZ, 0); /*