NFS: Replace kmap() with kmap_atomic() in nfs_readdir_search_array()

Trond Myklebust · Trond Myklebust · commit ed09222d651d · 2020-12-02T14:05:51.000-05:00
Signed-off-by: Trond Myklebust &lt;trond.myklebust@hammerspace.com&gt;
Reviewed-by: Benjamin Coddington &lt;bcodding@redhat.com&gt;
Tested-by: Benjamin Coddington &lt;bcodding@redhat.com&gt;
Tested-by: Dave Wysochanski &lt;dwysocha@redhat.com&gt;
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
@@ -447,7 +447,7 @@ int nfs_readdir_search_array(nfs_readdir_descriptor_t *desc)
 	struct nfs_cache_array *array;
 	int status;
 
-	array = kmap(desc->page);
+	array = kmap_atomic(desc->page);
 
 	if (desc->dir_cookie == 0)
 		status = nfs_readdir_search_for_pos(array, desc);
@@ -459,7 +459,7 @@ int nfs_readdir_search_array(nfs_readdir_descriptor_t *desc)
 		desc->current_index += array->size;
 		desc->page_index++;
 	}
-	kunmap(desc->page);
+	kunmap_atomic(array);
 	return status;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ int nfs_readdir_search_array(nfs_readdir_descriptor_t *desc)`
`447`	`447`	`struct nfs_cache_array *array;`
`448`	`448`	`int status;`
`449`	`449`
`450`		`- array = kmap(desc->page);`
	`450`	`+ array = kmap_atomic(desc->page);`
`451`	`451`
`452`	`452`	`if (desc->dir_cookie == 0)`
`453`	`453`	`status = nfs_readdir_search_for_pos(array, desc);`
`@@ -459,7 +459,7 @@ int nfs_readdir_search_array(nfs_readdir_descriptor_t *desc)`
`459`	`459`	`desc->current_index += array->size;`
`460`	`460`	`desc->page_index++;`
`461`	`461`	`}`
`462`		`- kunmap(desc->page);`
	`462`	`+ kunmap_atomic(array);`
`463`	`463`	`return status;`
`464`	`464`	`}`
`465`	`465`