Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ext4: Fix sparse warnings 



Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 717d50e4

fs/ext4/inode.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -3233,12 +3233,14 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode) 
						      iloc, handle);

						      iloc, handle);

			if (ret) {

			if (ret) {

				EXT4_I(inode)->i_state |= EXT4_STATE_NO_EXPAND;

				EXT4_I(inode)->i_state |= EXT4_STATE_NO_EXPAND;

				if (mnt_count != sbi->s_es->s_mnt_count) {

				if (mnt_count !=

					le16_to_cpu(sbi->s_es->s_mnt_count)) {

					ext4_warning(inode->i_sb, __FUNCTION__,

					ext4_warning(inode->i_sb, __FUNCTION__,

					"Unable to expand inode %lu. Delete"

					"Unable to expand inode %lu. Delete"

					" some EAs or run e2fsck.",

					" some EAs or run e2fsck.",

					inode->i_ino);

					inode->i_ino);

					mnt_count = sbi->s_es->s_mnt_count;

					mnt_count =

					  le16_to_cpu(sbi->s_es->s_mnt_count);

				}

				}

			}

			}

		}

		}

include/linux/ext4_fs.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -574,13 +574,13 @@ struct ext4_super_block { 
/*150*/	__le32	s_blocks_count_hi;	/* Blocks count */

/*150*/	__le32	s_blocks_count_hi;	/* Blocks count */

	__le32	s_r_blocks_count_hi;	/* Reserved blocks count */

	__le32	s_r_blocks_count_hi;	/* Reserved blocks count */

	__le32	s_free_blocks_count_hi;	/* Free blocks count */

	__le32	s_free_blocks_count_hi;	/* Free blocks count */

	__u16	s_min_extra_isize;	/* All inodes have at least # bytes */

	__le16	s_min_extra_isize;	/* All inodes have at least # bytes */

	__u16	s_want_extra_isize; 	/* New inodes should reserve # bytes */

	__le16	s_want_extra_isize; 	/* New inodes should reserve # bytes */

	__u32	s_flags;		/* Miscellaneous flags */

	__le32	s_flags;		/* Miscellaneous flags */

	__u16   s_raid_stride;		/* RAID stride */

	__le16  s_raid_stride;		/* RAID stride */

	__u16   s_mmp_interval;         /* # seconds to wait in MMP checking */

	__le16  s_mmp_interval;         /* # seconds to wait in MMP checking */

	__u64   s_mmp_block;            /* Block for multi-mount protection */

	__le64  s_mmp_block;            /* Block for multi-mount protection */

	__u32   s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/

	__le32  s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/

	__u32   s_reserved[163];        /* Padding to the end of the block */

	__u32   s_reserved[163];        /* Padding to the end of the block */

};

};