Commit 99e6f829 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o
Browse files

ext4: Introduce ext4_update_*_feature 



Introduce ext4_update_*_feature and use them instead
of opencoding.


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
parent 2aa9fc4c

fs/ext4/ialloc.c

+4 −7
Original line number Diff line number Diff line
@@ -748,13 +748,10 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode * dir, int mode) 
	if (test_opt(sb, EXTENTS)) {

		EXT4_I(inode)->i_flags |= EXT4_EXTENTS_FL;

		ext4_ext_tree_init(handle, inode);

		if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS)) {

			err = ext4_journal_get_write_access(handle, EXT4_SB(sb)->s_sbh);

			if (err) goto fail;

			EXT4_SET_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS);

			BUFFER_TRACE(EXT4_SB(sb)->s_sbh, "call ext4_journal_dirty_metadata");

			err = ext4_journal_dirty_metadata(handle, EXT4_SB(sb)->s_sbh);

		}

		err = ext4_update_incompat_feature(handle, sb,

						EXT4_FEATURE_INCOMPAT_EXTENTS);

		if (err)

			goto fail;

	}



	ext4_debug("allocating inode %lu\n", inode->i_ino);

fs/ext4/super.c

+60 −0
Original line number Diff line number Diff line
@@ -373,6 +373,66 @@ void ext4_update_dynamic_rev(struct super_block *sb) 
	 */

}



int ext4_update_compat_feature(handle_t *handle,

					struct super_block *sb, __u32 compat)

{

	int err = 0;

	if (!EXT4_HAS_COMPAT_FEATURE(sb, compat)) {

		err = ext4_journal_get_write_access(handle,

				EXT4_SB(sb)->s_sbh);

		if (err)

			return err;

		EXT4_SET_COMPAT_FEATURE(sb, compat);

		sb->s_dirt = 1;

		handle->h_sync = 1;

		BUFFER_TRACE(EXT4_SB(sb)->s_sbh,

					"call ext4_journal_dirty_met adata");

		err = ext4_journal_dirty_metadata(handle,

				EXT4_SB(sb)->s_sbh);

	}

	return err;

}



int ext4_update_rocompat_feature(handle_t *handle,

					struct super_block *sb, __u32 rocompat)

{

	int err = 0;

	if (!EXT4_HAS_RO_COMPAT_FEATURE(sb, rocompat)) {

		err = ext4_journal_get_write_access(handle,

				EXT4_SB(sb)->s_sbh);

		if (err)

			return err;

		EXT4_SET_RO_COMPAT_FEATURE(sb, rocompat);

		sb->s_dirt = 1;

		handle->h_sync = 1;

		BUFFER_TRACE(EXT4_SB(sb)->s_sbh,

					"call ext4_journal_dirty_met adata");

		err = ext4_journal_dirty_metadata(handle,

				EXT4_SB(sb)->s_sbh);

	}

	return err;

}



int ext4_update_incompat_feature(handle_t *handle,

					struct super_block *sb, __u32 incompat)

{

	int err = 0;

	if (!EXT4_HAS_INCOMPAT_FEATURE(sb, incompat)) {

		err = ext4_journal_get_write_access(handle,

				EXT4_SB(sb)->s_sbh);

		if (err)

			return err;

		EXT4_SET_INCOMPAT_FEATURE(sb, incompat);

		sb->s_dirt = 1;

		handle->h_sync = 1;

		BUFFER_TRACE(EXT4_SB(sb)->s_sbh,

					"call ext4_journal_dirty_met adata");

		err = ext4_journal_dirty_metadata(handle,

				EXT4_SB(sb)->s_sbh);

	}

	return err;

}



/*

 * Open the external journal device

 */

include/linux/ext4_fs.h

+6 −0
Original line number Diff line number Diff line
@@ -989,6 +989,12 @@ extern void ext4_abort (struct super_block *, const char *, const char *, ...) 
extern void ext4_warning (struct super_block *, const char *, const char *, ...)

	__attribute__ ((format (printf, 3, 4)));

extern void ext4_update_dynamic_rev (struct super_block *sb);

extern int ext4_update_compat_feature(handle_t *handle, struct super_block *sb,

					__u32 compat);

extern int ext4_update_rocompat_feature(handle_t *handle,

					struct super_block *sb,	__u32 rocompat);

extern int ext4_update_incompat_feature(handle_t *handle,

					struct super_block *sb,	__u32 incompat);

extern ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,

				      struct ext4_group_desc *bg);

extern ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb,