Commit c77c738c authored by Fabio M. De Francesco's avatar Fabio M. De Francesco Committed by Trond Myklebust
Browse files

nfs: Replace kmap() with kmap_local_page() 



The use of kmap() is being deprecated in favor of kmap_local_page().

With kmap_local_page(), the mapping is per thread, CPU local and not
globally visible. Furthermore, the mapping can be acquired from any context
(including interrupts).

Therefore, use kmap_local_page() in nfs_do_filldir() because this mapping
is per thread, CPU local, and not globally visible.

Suggested-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 064109db

fs/nfs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ static void nfs_do_filldir(struct nfs_readdir_descriptor *desc, 
	struct nfs_cache_array *array;

	unsigned int i;



	array = kmap(desc->page);

	array = kmap_local_page(desc->page);

	for (i = desc->cache_entry_index; i < array->size; i++) {

		struct nfs_cache_array_entry *ent;
@@ -1110,7 +1110,7 @@ static void nfs_do_filldir(struct nfs_readdir_descriptor *desc, 
	if (array->page_is_eof)

		desc->eof = !desc->eob;



	kunmap(desc->page);

	kunmap_local(array);

	dfprintk(DIRCACHE, "NFS: nfs_do_filldir() filling ended @ cookie %llu\n",

			(unsigned long long)desc->dir_cookie);

}