diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
commit | 616ad8c44281c0c6711a72b560e01ec335ff27e0 (patch) | |
tree | 0a20453ffedb09db6fb41a0c2208ccc2c7751d3a /fs/ubifs/commit.c | |
parent | 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f (diff) | |
parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'fs/ubifs/commit.c')
-rw-r--r-- | fs/ubifs/commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c index 3b516316c9b3..0a6aa2cc78f0 100644 --- a/fs/ubifs/commit.c +++ b/fs/ubifs/commit.c | |||
@@ -74,6 +74,7 @@ static int do_commit(struct ubifs_info *c) | |||
74 | goto out_up; | 74 | goto out_up; |
75 | } | 75 | } |
76 | 76 | ||
77 | c->cmt_no += 1; | ||
77 | err = ubifs_gc_start_commit(c); | 78 | err = ubifs_gc_start_commit(c); |
78 | if (err) | 79 | if (err) |
79 | goto out_up; | 80 | goto out_up; |
@@ -115,7 +116,7 @@ static int do_commit(struct ubifs_info *c) | |||
115 | goto out; | 116 | goto out; |
116 | 117 | ||
117 | mutex_lock(&c->mst_mutex); | 118 | mutex_lock(&c->mst_mutex); |
118 | c->mst_node->cmt_no = cpu_to_le64(++c->cmt_no); | 119 | c->mst_node->cmt_no = cpu_to_le64(c->cmt_no); |
119 | c->mst_node->log_lnum = cpu_to_le32(new_ltail_lnum); | 120 | c->mst_node->log_lnum = cpu_to_le32(new_ltail_lnum); |
120 | c->mst_node->root_lnum = cpu_to_le32(zroot.lnum); | 121 | c->mst_node->root_lnum = cpu_to_le32(zroot.lnum); |
121 | c->mst_node->root_offs = cpu_to_le32(zroot.offs); | 122 | c->mst_node->root_offs = cpu_to_le32(zroot.offs); |