diff mbox series

Remove iomap parameter from dax_pmd_load_hole()

Message ID 20181019192806.nkr7ngk2nugbruie@merlin (mailing list archive)
State New, archived
Headers show
Series Remove iomap parameter from dax_pmd_load_hole() | expand

Commit Message

Goldwyn Rodrigues Oct. 19, 2018, 7:28 p.m. UTC 
Trivial code cleanup.
This has been carried since the original patch
642261ac995e ("dax: add struct iomap based DAX PMD support")

dax_pmd_load_hole() does not use iomap. Remove the function parameter.

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>

Comments

Jan Kara Oct. 25, 2018, 11:47 a.m. UTC | #1 
On Fri 19-10-18 14:28:06, Goldwyn Rodrigues wrote:
> Trivial code cleanup.
> This has been carried since the original patch
> 642261ac995e ("dax: add struct iomap based DAX PMD support")
> 
> dax_pmd_load_hole() does not use iomap. Remove the function parameter.
> 
> Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>

Ross is no longer with Intel - replaced address. Also Dan merges DAX
patches like this - added to CC. Finally, feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> 
> diff --git a/fs/dax.c b/fs/dax.c
> index 0fb270f0a0ef..827acf713324 100644
> --- a/fs/dax.c
> +++ b/fs/dax.c
> @@ -1505,8 +1505,7 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,
>  }
>  
>  #ifdef CONFIG_FS_DAX_PMD
> -static vm_fault_t dax_pmd_load_hole(struct vm_fault *vmf, struct iomap *iomap,
> -		void *entry)
> +static vm_fault_t dax_pmd_load_hole(struct vm_fault *vmf, void *entry)
>  {
>  	struct address_space *mapping = vmf->vma->vm_file->f_mapping;
>  	unsigned long pmd_addr = vmf->address & PMD_MASK;
> @@ -1669,7 +1668,7 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,
>  	case IOMAP_HOLE:
>  		if (WARN_ON_ONCE(write))
>  			break;
> -		result = dax_pmd_load_hole(vmf, &iomap, entry);
> +		result = dax_pmd_load_hole(vmf, entry);
>  		break;
>  	default:
>  		WARN_ON_ONCE(1);
>
diff mbox series

Patch

diff --git a/fs/dax.c b/fs/dax.c
index 0fb270f0a0ef..827acf713324 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1505,8 +1505,7 @@  static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,
 }
 
 #ifdef CONFIG_FS_DAX_PMD
-static vm_fault_t dax_pmd_load_hole(struct vm_fault *vmf, struct iomap *iomap,
-		void *entry)
+static vm_fault_t dax_pmd_load_hole(struct vm_fault *vmf, void *entry)
 {
 	struct address_space *mapping = vmf->vma->vm_file->f_mapping;
 	unsigned long pmd_addr = vmf->address & PMD_MASK;
@@ -1669,7 +1668,7 @@  static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,
 	case IOMAP_HOLE:
 		if (WARN_ON_ONCE(write))
 			break;
-		result = dax_pmd_load_hole(vmf, &iomap, entry);
+		result = dax_pmd_load_hole(vmf, entry);
 		break;
 	default:
 		WARN_ON_ONCE(1);