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

Commit 52a2b53f authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

mm, dax: use i_mmap_unlock_write() in do_cow_fault() 



__dax_fault() takes i_mmap_lock for write. Let's pair it with write
unlock on do_cow_fault() side.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 46c043ed

mm/memory.c

+4 −4
Original line number Diff line number Diff line
@@ -3013,9 +3013,9 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma, 
		} else {

			/*

			 * The fault handler has no page to lock, so it holds

			 * i_mmap_lock for read to protect against truncate.

			 * i_mmap_lock for write to protect against truncate.

			 */

			i_mmap_unlock_read(vma->vm_file->f_mapping);

			i_mmap_unlock_write(vma->vm_file->f_mapping);

		}

		goto uncharge_out;

	}
@@ -3029,9 +3029,9 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma, 
	} else {

		/*

		 * The fault handler has no page to lock, so it holds

		 * i_mmap_lock for read to protect against truncate.

		 * i_mmap_lock for write to protect against truncate.

		 */

		i_mmap_unlock_read(vma->vm_file->f_mapping);

		i_mmap_unlock_write(vma->vm_file->f_mapping);

	}

	return ret;

uncharge_out: