Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech'...

[linux-2.6-microblaze.git] / fs / ubifs / commit.c

diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c
index 63f5661..ad292c5 100644 (file)
--- a/fs/ubifs/commit.c
+++ b/fs/ubifs/commit.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * This file is part of UBIFS.
  *
  * Copyright (C) 2006-2008 Nokia Corporation.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
  * Authors: Adrian Hunter
  *          Artem Bityutskiy (Битюцкий Артём)
  */
@@ -91,9 +79,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 +101,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;