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

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

vfs: remove get_xip_mem 



All callers of get_xip_mem() are now gone.  Remove checks for it,
initialisers of it, documentation of it and the only implementation of it.
 Also remove mm/filemap_xip.c as it is now empty.  Also remove
documentation of the long-gone get_xip_page().

Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.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: Mathieu Desnoyers <mathieu.desnoyers@efficios.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 95ec8dab

Documentation/filesystems/Locking

+0 −3
Original line number Diff line number Diff line
@@ -199,8 +199,6 @@ prototypes: 
	int (*releasepage) (struct page *, int);

	void (*freepage)(struct page *);

	int (*direct_IO)(int, struct kiocb *, struct iov_iter *iter, loff_t offset);

	int (*get_xip_mem)(struct address_space *, pgoff_t, int, void **,

				unsigned long *);

	int (*migratepage)(struct address_space *, struct page *, struct page *);

	int (*launder_page)(struct page *);

	int (*is_partially_uptodate)(struct page *, unsigned long, unsigned long);
@@ -225,7 +223,6 @@ invalidatepage: yes 
releasepage:		yes

freepage:		yes

direct_IO:

get_xip_mem:					maybe

migratepage:		yes (both)

launder_page:		yes

is_partially_uptodate:	yes

Documentation/filesystems/vfs.txt

+0 −7
Original line number Diff line number Diff line
@@ -591,8 +591,6 @@ struct address_space_operations { 
	int (*releasepage) (struct page *, int);

	void (*freepage)(struct page *);

	ssize_t (*direct_IO)(int, struct kiocb *, struct iov_iter *iter, loff_t offset);

	struct page* (*get_xip_page)(struct address_space *, sector_t,

			int);

	/* migrate the contents of a page to the specified target */

	int (*migratepage) (struct page *, struct page *);

	int (*launder_page) (struct page *);
@@ -748,11 +746,6 @@ struct address_space_operations { 
        and transfer data directly between the storage and the

        application's address space.



  get_xip_page: called by the VM to translate a block number to a page.

	The page is valid until the corresponding filesystem is unmounted.

	Filesystems that want to use execute-in-place (XIP) need to implement

	it.  An example implementation can be found in fs/ext2/xip.c.



  migrate_page:  This is used to compact the physical memory usage.

        If the VM wants to relocate a page (maybe off a memory card

        that is signalling imminent failure) it will pass a new page

fs/exofs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -985,7 +985,6 @@ const struct address_space_operations exofs_aops = { 
	.direct_IO	= exofs_direct_IO,



	/* With these NULL has special meaning or default is not exported */

	.get_xip_mem	= NULL,

	.migratepage	= NULL,

	.launder_page	= NULL,

	.is_partially_uptodate = NULL,

fs/ext2/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -894,7 +894,6 @@ const struct address_space_operations ext2_aops = { 


const struct address_space_operations ext2_aops_xip = {

	.bmap			= ext2_bmap,

	.get_xip_mem		= ext2_get_xip_mem,

	.direct_IO		= ext2_direct_IO,

};

fs/ext2/xip.c

+0 −45
Original line number Diff line number Diff line
@@ -13,35 +13,6 @@ 
#include "ext2.h"

#include "xip.h"



static inline long __inode_direct_access(struct inode *inode, sector_t block,

				void **kaddr, unsigned long *pfn, long size)

{

	struct block_device *bdev = inode->i_sb->s_bdev;

	sector_t sector = block * (PAGE_SIZE / 512);

	return bdev_direct_access(bdev, sector, kaddr, pfn, size);

}



static inline int

__ext2_get_block(struct inode *inode, pgoff_t pgoff, int create,

		   sector_t *result)

{

	struct buffer_head tmp;

	int rc;



	memset(&tmp, 0, sizeof(struct buffer_head));

	tmp.b_size = 1 << inode->i_blkbits;

	rc = ext2_get_block(inode, pgoff, &tmp, create);

	*result = tmp.b_blocknr;



	/* did we get a sparse block (hole in the file)? */

	if (!tmp.b_blocknr && !rc) {

		BUG_ON(create);

		rc = -ENODATA;

	}



	return rc;

}



void ext2_xip_verify_sb(struct super_block *sb)

{

	struct ext2_sb_info *sbi = EXT2_SB(sb);
@@ -54,19 +25,3 @@ void ext2_xip_verify_sb(struct super_block *sb) 
			     "not supported by bdev");

	}

}
 


int ext2_get_xip_mem(struct address_space *mapping, pgoff_t pgoff, int create,

				void **kmem, unsigned long *pfn)

{

	long rc;

	sector_t block;



	/* first, retrieve the sector number */

	rc = __ext2_get_block(mapping->host, pgoff, create, &block);

	if (rc)

		return rc;



	/* retrieve address of the target data */

	rc = __inode_direct_access(mapping->host, block, kmem, pfn, PAGE_SIZE);

	return (rc < 0) ? rc : 0;

}