Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ab8500...

[firefly-linux-kernel-4.4.55.git] / fs / reiserfs / resize.c

diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c
index 037b00c40f1fc6beacea2f2149def32d5490e521..6052d323bc9a75effe265bfaa392e9357b97a839 100644 (file)
--- a/fs/reiserfs/resize.c
+++ b/fs/reiserfs/resize.c
@@ -182,7 +182,7 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
        info = SB_AP_BITMAP(s) + bmap_nr - 1;
        bh = reiserfs_read_bitmap_block(s, bmap_nr - 1);
        if (!bh) {
-               int jerr = journal_end(&th, s, 10);
+               int jerr = journal_end(&th);
                if (jerr)
                        return jerr;
                return -EIO;
@@ -193,14 +193,14 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
                reiserfs_clear_le_bit(i, bh->b_data);
        info->free_count += s->s_blocksize * 8 - block_r;
 
-       journal_mark_dirty(&th, s, bh);
+       journal_mark_dirty(&th, bh);
        brelse(bh);
 
        /* Correct new last bitmap block - It may not be full */
        info = SB_AP_BITMAP(s) + bmap_nr_new - 1;
        bh = reiserfs_read_bitmap_block(s, bmap_nr_new - 1);
        if (!bh) {
-               int jerr = journal_end(&th, s, 10);
+               int jerr = journal_end(&th);
                if (jerr)
                        return jerr;
                return -EIO;
@@ -209,7 +209,7 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
        reiserfs_prepare_for_journal(s, bh, 1);
        for (i = block_r_new; i < s->s_blocksize * 8; i++)
                reiserfs_set_le_bit(i, bh->b_data);
-       journal_mark_dirty(&th, s, bh);
+       journal_mark_dirty(&th, bh);
        brelse(bh);
 
        info->free_count -= s->s_blocksize * 8 - block_r_new;
@@ -222,8 +222,8 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
        PUT_SB_BLOCK_COUNT(s, block_count_new);
        PUT_SB_BMAP_NR(s, bmap_would_wrap(bmap_nr_new) ? : bmap_nr_new);
 
-       journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB(s));
+       journal_mark_dirty(&th, SB_BUFFER_WITH_SB(s));
 
        SB_JOURNAL(s)->j_must_wait = 1;
-       return journal_end(&th, s, 10);
+       return journal_end(&th);
 }