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

Commit fc0ecff6 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] remove invalidate_inode_pages() 



Convert all calls to invalidate_inode_pages() into open-coded calls to
invalidate_mapping_pages().

Leave the invalidate_inode_pages() wrapper in place for now, marked as
deprecated.

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 54bc4855

drivers/md/bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ static void bitmap_file_put(struct bitmap *bitmap) 


	if (file) {

		struct inode *inode = file->f_path.dentry->d_inode;

		invalidate_inode_pages(inode->i_mapping);

		invalidate_mapping_pages(inode->i_mapping, 0, -1);

		fput(file);

	}

}

drivers/mtd/devices/block2mtd.c

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ static void block2mtd_free_device(struct block2mtd_dev *dev) 
	kfree(dev->mtd.name);



	if (dev->blkdev) {

		invalidate_inode_pages(dev->blkdev->bd_inode->i_mapping);

		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,

					0, -1);

		close_bdev_excl(dev->blkdev);

	}

drivers/usb/gadget/file_storage.c

+1 −1
Original line number Diff line number Diff line
@@ -1953,7 +1953,7 @@ static void invalidate_sub(struct lun *curlun) 
	struct inode	*inode = filp->f_path.dentry->d_inode;

	unsigned long	rc;



	rc = invalidate_inode_pages(inode->i_mapping);

	rc = invalidate_mapping_pages(inode->i_mapping, 0, -1);

	VLDBG(curlun, "invalidate_inode_pages -> %ld\n", rc);

}

fs/9p/vfs_file.c

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl) 


	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) {

		filemap_write_and_wait(inode->i_mapping);

		invalidate_inode_pages(&inode->i_data);

		invalidate_mapping_pages(&inode->i_data, 0, -1);

	}



	return res;

fs/buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ void invalidate_bdev(struct block_device *bdev, int destroy_dirty_buffers) 
	 * We really want to use invalidate_inode_pages2() for

	 * that, but not until that's cleaned up.

	 */

	invalidate_inode_pages(mapping);

	invalidate_mapping_pages(mapping, 0, -1);

}



/*