ext4: Cleanup whitespace and other miscellaneous style issues (2b2d6d01) · Commits · e / devices / android_kernel_sony_msm8998

fs/ext4/acl.c

+94 −94

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,7 @@ ext4_acl_from_disk(const void *value, size_t size)
	goto fail;		goto fail;
	acl->a_entries[n].e_tag = le16_to_cpu(entry->e_tag);		acl->a_entries[n].e_tag = le16_to_cpu(entry->e_tag);
	acl->a_entries[n].e_perm = le16_to_cpu(entry->e_perm);		acl->a_entries[n].e_perm = le16_to_cpu(entry->e_perm);

	switch (acl->a_entries[n].e_tag) {		switch (acl->a_entries[n].e_tag) {
	case ACL_USER_OBJ:		case ACL_USER_OBJ:
	case ACL_GROUP_OBJ:		case ACL_GROUP_OBJ:
	@@ -103,8 +104,7 @@ ext4_acl_to_disk(const struct posix_acl acl, size_t size)
	switch (acl->a_entries[n].e_tag) {		switch (acl->a_entries[n].e_tag) {
	case ACL_USER:		case ACL_USER:
	case ACL_GROUP:		case ACL_GROUP:
	entry->e_id =		entry->e_id = cpu_to_le32(acl->a_entries[n].e_id);
	cpu_to_le32(acl->a_entries[n].e_id);
	e += sizeof(ext4_acl_entry);		e += sizeof(ext4_acl_entry);
	break;		break;

fs/ext4/inode.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1054,10 +1054,9 @@ static void ext4_da_update_reserve_space(struct inode *inode, int used)


	/*		/*
			* The ext4_get_blocks_wrap() function try to look up the requested blocks,
			* and returns if the blocks are already mapped.
	*		*
	*
	* ext4_ext4 get_block() wrapper function
	* It will do a look up first, and returns if the blocks already mapped.
	* Otherwise it takes the write lock of the i_data_sem and allocate blocks		* Otherwise it takes the write lock of the i_data_sem and allocate blocks
	* and store the allocated blocks in the result buffer head and mark it		* and store the allocated blocks in the result buffer head and mark it
	* mapped.		* mapped.

fs/ext4/resize.c

+40 −39

Original line number	Original line	Diff line number	Diff line
	@@ -507,14 +507,14 @@ static int add_new_gdb(handle_t handle, struct inode inode,
	return 0;		return 0;

	exit_inode:		exit_inode:
	//ext4_journal_release_buffer(handle, iloc.bh);		/* ext4_journal_release_buffer(handle, iloc.bh); */
	brelse(iloc.bh);		brelse(iloc.bh);
	exit_dindj:		exit_dindj:
	//ext4_journal_release_buffer(handle, dind);		/* ext4_journal_release_buffer(handle, dind); */
	exit_primary:		exit_primary:
	//ext4_journal_release_buffer(handle, *primary);		/* ext4_journal_release_buffer(handle, primary); /
	exit_sbh:		exit_sbh:
	//ext4_journal_release_buffer(handle, *primary);		/* ext4_journal_release_buffer(handle, primary); /
	exit_dind:		exit_dind:
	brelse(dind);		brelse(dind);
	exit_bh:		exit_bh:
	@@ -946,7 +946,8 @@ exit_put:
	return err;		return err;
	} /* ext4_group_add */		} /* ext4_group_add */

	/* Extend the filesystem to the new number of blocks specified. This entry		/*
			* Extend the filesystem to the new number of blocks specified. This entry
	* point is only used to extend the current filesystem to the end of the last		* point is only used to extend the current filesystem to the end of the last
	* existing group. It can be accessed via ioctl, or by "remount,resize=<size>"		* existing group. It can be accessed via ioctl, or by "remount,resize=<size>"
	* for emergencies (because it has no dependencies on reserved blocks).		* for emergencies (because it has no dependencies on reserved blocks).

fs/ext4/super.c

+139 −144

Original line number	Original line	Diff line number	Diff line
	@@ -50,8 +50,7 @@ static int ext4_load_journal(struct super_block , struct ext4_super_block ,
	static int ext4_create_journal(struct super_block , struct ext4_super_block ,		static int ext4_create_journal(struct super_block , struct ext4_super_block ,
	unsigned int);		unsigned int);
	static void ext4_commit_super(struct super_block *sb,		static void ext4_commit_super(struct super_block *sb,
	struct ext4_super_block * es,		struct ext4_super_block *es, int sync);
	int sync);
	static void ext4_mark_recovery_complete(struct super_block *sb,		static void ext4_mark_recovery_complete(struct super_block *sb,
	struct ext4_super_block *es);		struct ext4_super_block *es);
	static void ext4_clear_journal_err(struct super_block *sb,		static void ext4_clear_journal_err(struct super_block *sb,
	@@ -278,8 +277,7 @@ static const char ext4_decode_error(struct super_block sb, int errno,
	/* __ext4_std_error decodes expected errors from journaling functions		/* __ext4_std_error decodes expected errors from journaling functions
	* automatically and invokes the appropriate error response. */		* automatically and invokes the appropriate error response. */

	void __ext4_std_error (struct super_block * sb, const char * function,		void __ext4_std_error(struct super_block sb, const char function, int errno)
	int errno)
	{		{
	char nbuf[16];		char nbuf[16];
	const char *errstr;		const char *errstr;
	@@ -647,7 +645,8 @@ static void ext4_clear_inode(struct inode *inode)
	&EXT4_I(inode)->jinode);		&EXT4_I(inode)->jinode);
	}		}

	static inline void ext4_show_quota_options(struct seq_file seq, struct super_block sb)		static inline void ext4_show_quota_options(struct seq_file *seq,
			struct super_block *sb)
	{		{
	#if defined(CONFIG_QUOTA)		#if defined(CONFIG_QUOTA)
	struct ext4_sb_info *sbi = EXT4_SB(sb);		struct ext4_sb_info *sbi = EXT4_SB(sb);
	@@ -1596,16 +1595,14 @@ static int ext4_check_descriptors(struct super_block *sb)
	(EXT4_BLOCKS_PER_GROUP(sb) - 1);		(EXT4_BLOCKS_PER_GROUP(sb) - 1);

	block_bitmap = ext4_block_bitmap(sb, gdp);		block_bitmap = ext4_block_bitmap(sb, gdp);
	if (block_bitmap < first_block \|\| block_bitmap > last_block)		if (block_bitmap < first_block \|\| block_bitmap > last_block) {
	{
	printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: "		printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: "
	"Block bitmap for group %lu not in group "		"Block bitmap for group %lu not in group "
	"(block %llu)!", i, block_bitmap);		"(block %llu)!", i, block_bitmap);
	return 0;		return 0;
	}		}
	inode_bitmap = ext4_inode_bitmap(sb, gdp);		inode_bitmap = ext4_inode_bitmap(sb, gdp);
	if (inode_bitmap < first_block \|\| inode_bitmap > last_block)		if (inode_bitmap < first_block \|\| inode_bitmap > last_block) {
	{
	printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: "		printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: "
	"Inode bitmap for group %lu not in group "		"Inode bitmap for group %lu not in group "
	"(block %llu)!", i, inode_bitmap);		"(block %llu)!", i, inode_bitmap);
	@@ -1613,8 +1610,7 @@ static int ext4_check_descriptors(struct super_block *sb)
	}		}
	inode_table = ext4_inode_table(sb, gdp);		inode_table = ext4_inode_table(sb, gdp);
	if (inode_table < first_block \|\|		if (inode_table < first_block \|\|
	inode_table + sbi->s_itb_per_group - 1 > last_block)		inode_table + sbi->s_itb_per_group - 1 > last_block) {
	{
	printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: "		printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: "
	"Inode table for group %lu not in group "		"Inode table for group %lu not in group "
	"(block %llu)!", i, inode_table);		"(block %llu)!", i, inode_table);
	@@ -2796,8 +2792,7 @@ static int ext4_create_journal(struct super_block * sb,
	}		}

	static void ext4_commit_super(struct super_block *sb,		static void ext4_commit_super(struct super_block *sb,
	struct ext4_super_block * es,		struct ext4_super_block *es, int sync)
	int sync)
	{		{
	struct buffer_head *sbh = EXT4_SB(sb)->s_sbh;		struct buffer_head *sbh = EXT4_SB(sb)->s_sbh;

	@@ -3354,7 +3349,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
	}		}
	/* Journaling quota? */		/* Journaling quota? */
	if (EXT4_SB(sb)->s_qf_names[type]) {		if (EXT4_SB(sb)->s_qf_names[type]) {
	/* Quotafile not of fs root? */		/* Quotafile not in fs root? */
	if (nd.path.dentry->d_parent->d_inode != sb->s_root->d_inode)		if (nd.path.dentry->d_parent->d_inode != sb->s_root->d_inode)
	printk(KERN_WARNING		printk(KERN_WARNING
	"EXT4-fs: Quota file not on filesystem root. "		"EXT4-fs: Quota file not on filesystem root. "

fs/ext4/extents.c

+1 −1

File changed.

Contains only whitespace changes.

fs/ext4/xattr.c

+1 −1

File changed.

Contains only whitespace changes.