Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[pandora-kernel.git] / fs / ubifs / commit.c

diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c
index 87cd0ea..fb3b5c8 100644 (file)
--- a/fs/ubifs/commit.c
+++ b/fs/ubifs/commit.c
@@ -78,7 +78,7 @@ static int nothing_to_commit(struct ubifs_info *c)
         * If the root TNC node is dirty, we definitely have something to
         * commit.
         */
-       if (c->zroot.znode && test_bit(DIRTY_ZNODE, &c->zroot.znode->flags))
+       if (c->zroot.znode && ubifs_zn_dirty(c->zroot.znode))
                return 0;
 
        /*
@@ -418,7 +418,7 @@ int ubifs_run_commit(struct ubifs_info *c)
 
        spin_lock(&c->cs_lock);
        if (c->cmt_state == COMMIT_BROKEN) {
-               err = -EINVAL;
+               err = -EROFS;
                goto out;
        }
 
@@ -444,7 +444,7 @@ int ubifs_run_commit(struct ubifs_info *c)
         * re-check it.
         */
        if (c->cmt_state == COMMIT_BROKEN) {
-               err = -EINVAL;
+               err = -EROFS;
                goto out_cmt_unlock;
        }
 
@@ -576,7 +576,7 @@ int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot)
        struct idx_node *i;
        size_t sz;
 
-       if (!(ubifs_chk_flags & UBIFS_CHK_OLD_IDX))
+       if (!dbg_is_chk_index(c))
                return 0;
 
        INIT_LIST_HEAD(&list);