+++ /dev/null
-Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/ext4.h
-===================================================================
---- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/ext4.h
-+++ linux-4.18.0-80.1.2.el8_0/fs/ext4/ext4.h
-@@ -1591,6 +1591,8 @@ static inline void ext4_clear_state_flag
- */
- #define NEXT_ORPHAN(inode) EXT4_I(inode)->i_dtime
-
-+#define JOURNAL_START_HAS_3ARGS 1
-+
- /*
- * Codes for operating systems
- */
-@@ -1805,7 +1807,21 @@ static inline bool ext4_has_unknown_ext#
-
- EXTN_FEATURE_FUNCS(2)
- EXTN_FEATURE_FUNCS(3)
--EXTN_FEATURE_FUNCS(4)
-+static inline bool ext4_has_unknown_ext4_compat_features(struct super_block *sb)
-+{
-+ return ((EXT4_SB(sb)->s_es->s_feature_compat &
-+ cpu_to_le32(~EXT4_FEATURE_COMPAT_SUPP)) != 0);
-+}
-+static inline bool ext4_has_unknown_ext4_ro_compat_features(struct super_block *sb)
-+{
-+ return ((EXT4_SB(sb)->s_es->s_feature_ro_compat &
-+ cpu_to_le32(~EXT4_FEATURE_RO_COMPAT_SUPP)) != 0);
-+}
-+static inline bool ext4_has_unknown_ext4_incompat_features(struct super_block *sb)
-+{
-+ return ((EXT4_SB(sb)->s_es->s_feature_incompat &
-+ cpu_to_le32(~EXT4_FEATURE_INCOMPAT_SUPP)) != 0);
-+}
-
- static inline bool ext4_has_compat_features(struct super_block *sb)
- {
-@@ -3111,6 +3127,13 @@ struct ext4_extent;
-
- extern int ext4_ext_tree_init(handle_t *handle, struct inode *);
- extern int ext4_ext_writepage_trans_blocks(struct inode *, int);
-+extern struct buffer_head *ext4_read_inode_bitmap(struct super_block *sb,
-+ ext4_group_t block_group);
-+extern void ext4_inc_count(handle_t *handle, struct inode *inode);
-+extern void ext4_dec_count(handle_t *handle, struct inode *inode);
-+extern struct buffer_head *ext4_append(handle_t *handle,
-+ struct inode *inode,
-+ ext4_lblk_t *block);
- extern int ext4_ext_index_trans_blocks(struct inode *inode, int extents);
- extern int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
- struct ext4_map_blocks *map, int flags);
-Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/ialloc.c
-===================================================================
---- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/ialloc.c
-+++ linux-4.18.0-80.1.2.el8_0/fs/ext4/ialloc.c
-@@ -114,7 +114,7 @@ verified:
- *
- * Return buffer_head of bitmap on success or NULL.
- */
--static struct buffer_head *
-+struct buffer_head *
- ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
- {
- struct ext4_group_desc *desc;
-@@ -211,6 +211,7 @@ out:
- put_bh(bh);
- return ERR_PTR(err);
- }
-+EXPORT_SYMBOL(ext4_read_inode_bitmap);
-
- /*
- * NOTE! When we get the inode, we're the only people
-Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/inode.c
-===================================================================
---- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/inode.c
-+++ linux-4.18.0-80.1.2.el8_0/fs/ext4/inode.c
-@@ -6267,3 +6267,19 @@ int ext4_filemap_fault(struct vm_fault *
-
- return err;
- }
-+EXPORT_SYMBOL(ext4_map_blocks);
-+EXPORT_SYMBOL(ext4_truncate);
-+EXPORT_SYMBOL(ext4_iget);
-+EXPORT_SYMBOL(ext4_bread);
-+EXPORT_SYMBOL(ext4_itable_unused_count);
-+EXPORT_SYMBOL(ext4_force_commit);
-+EXPORT_SYMBOL(ext4_mark_inode_dirty);
-+EXPORT_SYMBOL(ext4_get_group_desc);
-+EXPORT_SYMBOL(__ext4_journal_get_write_access);
-+EXPORT_SYMBOL(__ext4_journal_start_sb);
-+EXPORT_SYMBOL(__ext4_journal_stop);
-+EXPORT_SYMBOL(__ext4_handle_dirty_metadata);
-+EXPORT_SYMBOL(__ext4_std_error);
-+EXPORT_SYMBOL(ext4fs_dirhash);
-+EXPORT_SYMBOL(ext4_get_inode_loc);
-+EXPORT_SYMBOL(ext4_chunk_trans_blocks);
-Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/namei.c
-===================================================================
---- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/namei.c
-+++ linux-4.18.0-80.1.2.el8_0/fs/ext4/namei.c
-@@ -49,7 +49,7 @@
- #define NAMEI_RA_BLOCKS 4
- #define NAMEI_RA_SIZE (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
-
--static struct buffer_head *ext4_append(handle_t *handle,
-+struct buffer_head *ext4_append(handle_t *handle,
- struct inode *inode,
- ext4_lblk_t *block)
- {
-@@ -160,6 +160,7 @@ static struct buffer_head *__ext4_read_d
- }
- return bh;
- }
-+EXPORT_SYMBOL(ext4_append);
-
- #ifndef assert
- #define assert(test) J_ASSERT(test)
-@@ -2415,23 +2416,25 @@ EXPORT_SYMBOL(ext4_delete_entry);
- * for checking S_ISDIR(inode) (since the INODE_INDEX feature will not be set
- * on regular files) and to avoid creating huge/slow non-HTREE directories.
- */
--static void ext4_inc_count(handle_t *handle, struct inode *inode)
-+void ext4_inc_count(handle_t *handle, struct inode *inode)
- {
- inc_nlink(inode);
- if (is_dx(inode) &&
- (inode->i_nlink > EXT4_LINK_MAX || inode->i_nlink == 2))
- set_nlink(inode, 1);
- }
-+EXPORT_SYMBOL(ext4_inc_count);
-
- /*
- * If a directory had nlink == 1, then we should let it be 1. This indicates
- * directory has >EXT4_LINK_MAX subdirs.
- */
--static void ext4_dec_count(handle_t *handle, struct inode *inode)
-+void ext4_dec_count(handle_t *handle, struct inode *inode)
- {
- if (!S_ISDIR(inode->i_mode) || inode->i_nlink > 2)
- drop_nlink(inode);
- }
-+EXPORT_SYMBOL(ext4_dec_count);
-
-
- static int ext4_add_nondir(handle_t *handle,
-Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/super.c
-===================================================================
---- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/super.c
-+++ linux-4.18.0-80.1.2.el8_0/fs/ext4/super.c
-@@ -323,11 +323,11 @@ static void __save_error_info(struct sup
- return;
- es->s_state |= cpu_to_le16(EXT4_ERROR_FS);
- es->s_last_error_time = cpu_to_le32(get_seconds());
-- strncpy(es->s_last_error_func, func, sizeof(es->s_last_error_func));
-+ strlcpy(es->s_last_error_func, func, sizeof(es->s_last_error_func));
- es->s_last_error_line = cpu_to_le32(line);
- if (!es->s_first_error_time) {
- es->s_first_error_time = es->s_last_error_time;
-- strncpy(es->s_first_error_func, func,
-+ strlcpy(es->s_first_error_func, func,
- sizeof(es->s_first_error_func));
- es->s_first_error_line = cpu_to_le32(line);
- es->s_first_error_ino = es->s_last_error_ino;
-@@ -5957,16 +5957,12 @@ static int __init ext4_init_fs(void)
- err = init_inodecache();
- if (err)
- goto out1;
-- register_as_ext3();
-- register_as_ext2();
- err = register_filesystem(&ext4_fs_type);
- if (err)
- goto out;
-
- return 0;
- out:
-- unregister_as_ext2();
-- unregister_as_ext3();
- destroy_inodecache();
- out1:
- ext4_exit_mballoc();
-@@ -5985,8 +5981,6 @@ out5:
- static void __exit ext4_exit_fs(void)
- {
- ext4_destroy_lazyinit_thread();
-- unregister_as_ext2();
-- unregister_as_ext3();
- unregister_filesystem(&ext4_fs_type);
- destroy_inodecache();
- ext4_exit_mballoc();
git://git.whamcloud.com / fs / lustre-release.git / blobdiff