Commit 8e2c08d1 authored May 23, 2019 by Jaegeuk Kim

Merge remote-tracking branch 'origin/upstream-f2fs-stable-linux-4.9.y' into android-4.9



* origin/upstream-f2fs-stable-linux-4.9.y:
  ext4: fix build warning

Change-Id: Iebb5a46a921ff92305d84330afb8ff2e7946a18b
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>

parents df08e347 6566a546

fs/ext4/file.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -301,8 +301,6 @@ static const struct vm_operations_struct ext4_file_vm_ops = {

		static int ext4_file_mmap(struct file file, struct vm_area_struct vma)
		{
		struct inode *inode = file->f_mapping->host;

		file_accessed(file);
		if (IS_DAX(file_inode(file))) {
		vma->vm_ops = &ext4_dax_vm_ops;