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

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

ext4: sparse fixes 



* Change EXT4_HAS_*_FEATURE to return a boolean
* Add a function prototype for ext4_fiemap() in ext4.h
* Make ext4_ext_fiemap_cb() and ext4_xattr_fiemap() be static functions
* Add lock annotations to mb_free_blocks()

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 1a0d3786

fs/ext4/ext4.h

+6 −3
Original line number Diff line number Diff line
@@ -727,11 +727,11 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) 
 */



#define EXT4_HAS_COMPAT_FEATURE(sb,mask)			\

	(EXT4_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask))

	((EXT4_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask)) != 0)

#define EXT4_HAS_RO_COMPAT_FEATURE(sb,mask)			\

	(EXT4_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask))

	((EXT4_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask)) != 0)

#define EXT4_HAS_INCOMPAT_FEATURE(sb,mask)			\

	(EXT4_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask))

	((EXT4_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask)) != 0)

#define EXT4_SET_COMPAT_FEATURE(sb,mask)			\

	EXT4_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask)

#define EXT4_SET_RO_COMPAT_FEATURE(sb,mask)			\
@@ -1286,6 +1286,9 @@ extern int ext4_get_blocks_wrap(handle_t *handle, struct inode *inode, 
			sector_t block, unsigned int max_blocks,

			struct buffer_head *bh, int create,

			int extend_disksize, int flag);

extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

			__u64 start, __u64 len);



#endif	/* __KERNEL__ */



#endif	/* _EXT4_H */

fs/ext4/extents.c

+3 −2
Original line number Diff line number Diff line
@@ -3080,7 +3080,7 @@ long ext4_fallocate(struct inode *inode, int mode, loff_t offset, loff_t len) 
/*

 * Callback function called for each extent to gather FIEMAP information.

 */

int ext4_ext_fiemap_cb(struct inode *inode, struct ext4_ext_path *path,

static int ext4_ext_fiemap_cb(struct inode *inode, struct ext4_ext_path *path,

		       struct ext4_ext_cache *newex, struct ext4_extent *ex,

		       void *data)

{
@@ -3149,7 +3149,8 @@ int ext4_ext_fiemap_cb(struct inode *inode, struct ext4_ext_path *path, 
/* fiemap flags we can handle specified here */

#define EXT4_FIEMAP_FLAGS	(FIEMAP_FLAG_SYNC|FIEMAP_FLAG_XATTR)



int ext4_xattr_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo)

static int ext4_xattr_fiemap(struct inode *inode,

				struct fiemap_extent_info *fieinfo)

{

	__u64 physical = 0;

	__u64 length;

fs/ext4/file.c

+0 −3
Original line number Diff line number Diff line
@@ -140,9 +140,6 @@ static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma) 
	return 0;

}



extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

		__u64 start, __u64 len);



const struct file_operations ext4_file_operations = {

	.llseek		= generic_file_llseek,

	.read		= do_sync_read,

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3907,7 +3907,7 @@ static int __ext4_get_inode_loc(struct inode *inode, 
	ext4_fsblk_t		block;

	int			inodes_per_block, inode_offset;



	iloc->bh = 0;

	iloc->bh = NULL;

	if (!ext4_valid_inum(sb, inode->i_ino))

		return -EIO;

fs/ext4/mballoc.c

+3 −1
Original line number Diff line number Diff line
@@ -1056,6 +1056,8 @@ static void mb_set_bits(spinlock_t *lock, void *bm, int cur, int len) 


static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,

			  int first, int count)

__releases(bitlock)

__acquires(bitlock)

{

	int block = 0;

	int max = 0;
@@ -2244,7 +2246,7 @@ ext4_mb_store_history(struct ext4_allocation_context *ac) 




/* Create and initialize ext4_group_info data for the given group. */

int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,

static int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,

			  struct ext4_group_desc *desc)

{

	int i, len;