Merge tag 'selinux-pr-20210805' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / include / linux / jbd2.h

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 6cc03532156276fdd40ba814c2b5c40a51b9b982..fd933c45281af84c8391e3845021c70518c6b164 100644 (file)
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -918,11 +918,11 @@ struct journal_s
        struct shrinker         j_shrinker;
 
        /**
-        * @j_jh_shrink_count:
+        * @j_checkpoint_jh_count:
         *
         * Number of journal buffers on the checkpoint list. [j_list_lock]
         */
-       struct percpu_counter   j_jh_shrink_count;
+       struct percpu_counter   j_checkpoint_jh_count;
 
        /**
         * @j_shrink_transaction:
@@ -1556,8 +1556,6 @@ extern int           jbd2_journal_set_features
                   (journal_t *, unsigned long, unsigned long, unsigned long);
 extern void       jbd2_journal_clear_features
                   (journal_t *, unsigned long, unsigned long, unsigned long);
-extern int        jbd2_journal_register_shrinker(journal_t *journal);
-extern void       jbd2_journal_unregister_shrinker(journal_t *journal);
 extern int        jbd2_journal_load       (journal_t *journal);
 extern int        jbd2_journal_destroy    (journal_t *);
 extern int        jbd2_journal_recover    (journal_t *journal);