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

Commit 97443aa8 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds
Browse files

ext2: remove ext2_aops_xip 



We shouldn't need a special address_space_operations any more

Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
Reviewed-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Boaz Harrosh <boaz@plexistor.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6cd176a5

fs/ext2/ext2.h

+0 −1
Original line number Diff line number Diff line
@@ -796,7 +796,6 @@ extern const struct file_operations ext2_xip_file_operations; 


/* inode.c */

extern const struct address_space_operations ext2_aops;

extern const struct address_space_operations ext2_aops_xip;

extern const struct address_space_operations ext2_nobh_aops;



/* namei.c */

fs/ext2/inode.c

+1 −6
Original line number Diff line number Diff line
@@ -891,11 +891,6 @@ const struct address_space_operations ext2_aops = { 
	.error_remove_page	= generic_error_remove_page,

};



const struct address_space_operations ext2_aops_xip = {

	.bmap			= ext2_bmap,

	.direct_IO		= ext2_direct_IO,

};



const struct address_space_operations ext2_nobh_aops = {

	.readpage		= ext2_readpage,

	.readpages		= ext2_readpages,
@@ -1394,7 +1389,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino) 
	if (S_ISREG(inode->i_mode)) {

		inode->i_op = &ext2_file_inode_operations;

		if (test_opt(inode->i_sb, XIP)) {

			inode->i_mapping->a_ops = &ext2_aops_xip;

			inode->i_mapping->a_ops = &ext2_aops;

			inode->i_fop = &ext2_xip_file_operations;

		} else if (test_opt(inode->i_sb, NOBH)) {

			inode->i_mapping->a_ops = &ext2_nobh_aops;

fs/ext2/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int ext2_create (struct inode * dir, struct dentry * dentry, umode_t mode 


	inode->i_op = &ext2_file_inode_operations;

	if (test_opt(inode->i_sb, XIP)) {

		inode->i_mapping->a_ops = &ext2_aops_xip;

		inode->i_mapping->a_ops = &ext2_aops;

		inode->i_fop = &ext2_xip_file_operations;

	} else if (test_opt(inode->i_sb, NOBH)) {

		inode->i_mapping->a_ops = &ext2_nobh_aops;
@@ -126,7 +126,7 @@ static int ext2_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) 


	inode->i_op = &ext2_file_inode_operations;

	if (test_opt(inode->i_sb, XIP)) {

		inode->i_mapping->a_ops = &ext2_aops_xip;

		inode->i_mapping->a_ops = &ext2_aops;

		inode->i_fop = &ext2_xip_file_operations;

	} else if (test_opt(inode->i_sb, NOBH)) {

		inode->i_mapping->a_ops = &ext2_nobh_aops;