diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 14:16:33 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 14:16:33 +0300 |
| commit | 472475000979a156bc32cd75caa59737f5a1caa5 (patch) | |
| tree | 6a98319244f7954237cf866c8862ffe3f6128d2d /fs/ubifs/commit.c | |
| parent | 712fca63f50a87780ca6dc105370557a945a7ee8 (diff) | |
| parent | 9d7b18668956c411a422d04c712994c5fdb23a4b (diff) | |
| download | linux-472475000979a156bc32cd75caa59737f5a1caa5.tar.xz | |
Merge branch 'for-4.20/apple' into for-linus
Support for Apple Magic Trackpad 2
Diffstat (limited to 'fs/ubifs/commit.c')
| -rw-r--r-- | fs/ubifs/commit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c index 63f56619991d..591f2c7a48f0 100644 --- a/fs/ubifs/commit.c +++ b/fs/ubifs/commit.c @@ -91,9 +91,9 @@ static int nothing_to_commit(struct ubifs_info *c) if (c->nroot && test_bit(DIRTY_CNODE, &c->nroot->flags)) return 0; - ubifs_assert(atomic_long_read(&c->dirty_zn_cnt) == 0); - ubifs_assert(c->dirty_pn_cnt == 0); - ubifs_assert(c->dirty_nn_cnt == 0); + ubifs_assert(c, atomic_long_read(&c->dirty_zn_cnt) == 0); + ubifs_assert(c, c->dirty_pn_cnt == 0); + ubifs_assert(c, c->dirty_nn_cnt == 0); return 1; } @@ -113,7 +113,7 @@ static int do_commit(struct ubifs_info *c) struct ubifs_lp_stats lst; dbg_cmt("start"); - ubifs_assert(!c->ro_media && !c->ro_mount); + ubifs_assert(c, !c->ro_media && !c->ro_mount); if (c->ro_error) { err = -EROFS; |