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

Commit 2b86ce2d authored by Cong Wang's avatar Cong Wang Committed by Cong Wang
Browse files

nfs: remove the second argument of k[un]map_atomic() 



Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent 27a6d5c7

fs/nfs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -260,10 +260,10 @@ void nfs_readdir_clear_array(struct page *page) 
	struct nfs_cache_array *array;

	int i;



	array = kmap_atomic(page, KM_USER0);

	array = kmap_atomic(page);

	for (i = 0; i < array->size; i++)

		kfree(array->array[i].string.name);

	kunmap_atomic(array, KM_USER0);

	kunmap_atomic(array);

}



/*
@@ -1870,11 +1870,11 @@ static int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *sym 
	if (!page)

		return -ENOMEM;



	kaddr = kmap_atomic(page, KM_USER0);

	kaddr = kmap_atomic(page);

	memcpy(kaddr, symname, pathlen);

	if (pathlen < PAGE_SIZE)

		memset(kaddr + pathlen, 0, PAGE_SIZE - pathlen);

	kunmap_atomic(kaddr, KM_USER0);

	kunmap_atomic(kaddr);



	error = NFS_PROTO(dir)->symlink(dir, dentry, page, pathlen, &attr);

	if (error != 0) {

fs/nfs/nfs4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent 
	 * when talking to the server, we always send cookie 0

	 * instead of 1 or 2.

	 */

	start = p = kmap_atomic(*readdir->pages, KM_USER0);

	start = p = kmap_atomic(*readdir->pages);

	

	if (cookie == 0) {

		*p++ = xdr_one;                                  /* next */
@@ -221,7 +221,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent 


	readdir->pgbase = (char *)p - (char *)start;

	readdir->count -= readdir->pgbase;

	kunmap_atomic(start, KM_USER0);

	kunmap_atomic(start);

}



static int nfs4_wait_clnt_recover(struct nfs_client *clp)