Commit 46797ad7 authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

ext4: uninline ext4_inode_journal_mode() 



Determining an inode's journaling mode has gotten more complicated over
time.  Move ext4_inode_journal_mode() from an inline function into
ext4_jbd2.c to reduce the compiled code size.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20191209233602.117778-1-ebiggers@kernel.org


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 64c314ff

fs/ext4/ext4_jbd2.c

+22 −0
Original line number Diff line number Diff line
@@ -7,6 +7,28 @@ 


#include <trace/events/ext4.h>



int ext4_inode_journal_mode(struct inode *inode)

{

	if (EXT4_JOURNAL(inode) == NULL)

		return EXT4_INODE_WRITEBACK_DATA_MODE;	/* writeback */

	/* We do not support data journalling with delayed allocation */

	if (!S_ISREG(inode->i_mode) ||

	    ext4_test_inode_flag(inode, EXT4_INODE_EA_INODE) ||

	    test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA ||

	    (ext4_test_inode_flag(inode, EXT4_INODE_JOURNAL_DATA) &&

	    !test_opt(inode->i_sb, DELALLOC))) {

		/* We do not support data journalling for encrypted data */

		if (S_ISREG(inode->i_mode) && IS_ENCRYPTED(inode))

			return EXT4_INODE_ORDERED_DATA_MODE;  /* ordered */

		return EXT4_INODE_JOURNAL_DATA_MODE;	/* journal data */

	}

	if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_ORDERED_DATA)

		return EXT4_INODE_ORDERED_DATA_MODE;	/* ordered */

	if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_WRITEBACK_DATA)

		return EXT4_INODE_WRITEBACK_DATA_MODE;	/* writeback */

	BUG();

}



/* Just increment the non-pointer handle value */

static handle_t *ext4_get_nojournal(void)

{

fs/ext4/ext4_jbd2.h

+1 −21
Original line number Diff line number Diff line
@@ -463,27 +463,7 @@ int ext4_force_commit(struct super_block *sb); 
#define EXT4_INODE_ORDERED_DATA_MODE	0x02 /* ordered data mode */

#define EXT4_INODE_WRITEBACK_DATA_MODE	0x04 /* writeback data mode */



static inline int ext4_inode_journal_mode(struct inode *inode)

{

	if (EXT4_JOURNAL(inode) == NULL)

		return EXT4_INODE_WRITEBACK_DATA_MODE;	/* writeback */

	/* We do not support data journalling with delayed allocation */

	if (!S_ISREG(inode->i_mode) ||

	    ext4_test_inode_flag(inode, EXT4_INODE_EA_INODE) ||

	    test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA ||

	    (ext4_test_inode_flag(inode, EXT4_INODE_JOURNAL_DATA) &&

	    !test_opt(inode->i_sb, DELALLOC))) {

		/* We do not support data journalling for encrypted data */

		if (S_ISREG(inode->i_mode) && IS_ENCRYPTED(inode))

			return EXT4_INODE_ORDERED_DATA_MODE;  /* ordered */

		return EXT4_INODE_JOURNAL_DATA_MODE;	/* journal data */

	}

	if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_ORDERED_DATA)

		return EXT4_INODE_ORDERED_DATA_MODE;	/* ordered */

	if (test_opt(inode->i_sb, DATA_FLAGS) == EXT4_MOUNT_WRITEBACK_DATA)

		return EXT4_INODE_WRITEBACK_DATA_MODE;	/* writeback */

	BUG();

}

int ext4_inode_journal_mode(struct inode *inode);



static inline int ext4_should_journal_data(struct inode *inode)

{