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

Commit 1c271479 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tags/ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext2/4 DAX fix from Ted Ts'o:
 "This fixes a file system corruption bug with DAX"

* tag 'tags/ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext2, ext4: fix issue with missing journal entry in ext4_dax_mkwrite()
parents a9f8094a 1e9d180b

fs/ext2/file.c

+1 −18
Original line number Diff line number Diff line
@@ -80,23 +80,6 @@ static int ext2_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr, 
	return ret;

}



static int ext2_dax_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)

{

	struct inode *inode = file_inode(vma->vm_file);

	struct ext2_inode_info *ei = EXT2_I(inode);

	int ret;



	sb_start_pagefault(inode->i_sb);

	file_update_time(vma->vm_file);

	down_read(&ei->dax_sem);



	ret = __dax_mkwrite(vma, vmf, ext2_get_block, NULL);



	up_read(&ei->dax_sem);

	sb_end_pagefault(inode->i_sb);

	return ret;

}



static int ext2_dax_pfn_mkwrite(struct vm_area_struct *vma,

		struct vm_fault *vmf)

{
@@ -124,7 +107,7 @@ static int ext2_dax_pfn_mkwrite(struct vm_area_struct *vma, 
static const struct vm_operations_struct ext2_dax_vm_ops = {

	.fault		= ext2_dax_fault,

	.pmd_fault	= ext2_dax_pmd_fault,

	.page_mkwrite	= ext2_dax_mkwrite,

	.page_mkwrite	= ext2_dax_fault,

	.pfn_mkwrite	= ext2_dax_pfn_mkwrite,

};

fs/ext4/file.c

+2 −17
Original line number Diff line number Diff line
@@ -262,23 +262,8 @@ static int ext4_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr, 
	return result;

}



static int ext4_dax_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)

{

	int err;

	struct inode *inode = file_inode(vma->vm_file);



	sb_start_pagefault(inode->i_sb);

	file_update_time(vma->vm_file);

	down_read(&EXT4_I(inode)->i_mmap_sem);

	err = __dax_mkwrite(vma, vmf, ext4_dax_mmap_get_block, NULL);

	up_read(&EXT4_I(inode)->i_mmap_sem);

	sb_end_pagefault(inode->i_sb);



	return err;

}



/*

 * Handle write fault for VM_MIXEDMAP mappings. Similarly to ext4_dax_mkwrite()

 * Handle write fault for VM_MIXEDMAP mappings. Similarly to ext4_dax_fault()

 * handler we check for races agaist truncate. Note that since we cycle through

 * i_mmap_sem, we are sure that also any hole punching that began before we

 * were called is finished by now and so if it included part of the file we
@@ -311,7 +296,7 @@ static int ext4_dax_pfn_mkwrite(struct vm_area_struct *vma, 
static const struct vm_operations_struct ext4_dax_vm_ops = {

	.fault		= ext4_dax_fault,

	.pmd_fault	= ext4_dax_pmd_fault,

	.page_mkwrite	= ext4_dax_mkwrite,

	.page_mkwrite	= ext4_dax_fault,

	.pfn_mkwrite	= ext4_dax_pfn_mkwrite,

};

#else