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

Commit 8ff6daa1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

iomap: constify struct iomap_ops 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent b6f41e44

fs/dax.c

+3 −3
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, 
 */

ssize_t

dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,

		struct iomap_ops *ops)

		const struct iomap_ops *ops)

{

	struct address_space *mapping = iocb->ki_filp->f_mapping;

	struct inode *inode = mapping->host;
@@ -1118,7 +1118,7 @@ static int dax_fault_return(int error) 
 * necessary locking for the page fault to proceed successfully.

 */

int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf,

			struct iomap_ops *ops)

			const struct iomap_ops *ops)

{

	struct address_space *mapping = vma->vm_file->f_mapping;

	struct inode *inode = mapping->host;
@@ -1317,7 +1317,7 @@ static int dax_pmd_load_hole(struct vm_area_struct *vma, pmd_t *pmd, 
}



int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,

		pmd_t *pmd, unsigned int flags, struct iomap_ops *ops)

		pmd_t *pmd, unsigned int flags, const struct iomap_ops *ops)

{

	struct address_space *mapping = vma->vm_file->f_mapping;

	unsigned long pmd_addr = address & PMD_MASK;

fs/ext2/ext2.h

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ extern const struct file_operations ext2_file_operations; 
/* inode.c */

extern const struct address_space_operations ext2_aops;

extern const struct address_space_operations ext2_nobh_aops;

extern struct iomap_ops ext2_iomap_ops;

extern const struct iomap_ops ext2_iomap_ops;



/* namei.c */

extern const struct inode_operations ext2_dir_inode_operations;

fs/ext2/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -842,13 +842,13 @@ ext2_iomap_end(struct inode *inode, loff_t offset, loff_t length, 
	return 0;

}



struct iomap_ops ext2_iomap_ops = {

const struct iomap_ops ext2_iomap_ops = {

	.iomap_begin		= ext2_iomap_begin,

	.iomap_end		= ext2_iomap_end,

};

#else

/* Define empty ops for !CONFIG_FS_DAX case to avoid ugly ifdefs */

struct iomap_ops ext2_iomap_ops;

const struct iomap_ops ext2_iomap_ops;

#endif /* CONFIG_FS_DAX */



int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -3253,7 +3253,7 @@ static inline void ext4_clear_io_unwritten_flag(ext4_io_end_t *io_end) 
	}

}



extern struct iomap_ops ext4_iomap_ops;

extern const struct iomap_ops ext4_iomap_ops;



#endif	/* __KERNEL__ */

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3420,7 +3420,7 @@ static int ext4_iomap_end(struct inode *inode, loff_t offset, loff_t length, 
	return ret;

}



struct iomap_ops ext4_iomap_ops = {

const struct iomap_ops ext4_iomap_ops = {

	.iomap_begin		= ext4_iomap_begin,

	.iomap_end		= ext4_iomap_end,

};