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

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

Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent 27a6d5c7
...@@ -260,10 +260,10 @@ void nfs_readdir_clear_array(struct page *page) ...@@ -260,10 +260,10 @@ void nfs_readdir_clear_array(struct page *page)
struct nfs_cache_array *array; struct nfs_cache_array *array;
int i; int i;
array = kmap_atomic(page, KM_USER0); array = kmap_atomic(page);
for (i = 0; i < array->size; i++) for (i = 0; i < array->size; i++)
kfree(array->array[i].string.name); 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 ...@@ -1870,11 +1870,11 @@ static int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *sym
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
kaddr = kmap_atomic(page, KM_USER0); kaddr = kmap_atomic(page);
memcpy(kaddr, symname, pathlen); memcpy(kaddr, symname, pathlen);
if (pathlen < PAGE_SIZE) if (pathlen < PAGE_SIZE)
memset(kaddr + pathlen, 0, PAGE_SIZE - pathlen); 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); error = NFS_PROTO(dir)->symlink(dir, dentry, page, pathlen, &attr);
if (error != 0) { if (error != 0) {
......
...@@ -193,7 +193,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent ...@@ -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 * when talking to the server, we always send cookie 0
* instead of 1 or 2. * instead of 1 or 2.
*/ */
start = p = kmap_atomic(*readdir->pages, KM_USER0); start = p = kmap_atomic(*readdir->pages);
if (cookie == 0) { if (cookie == 0) {
*p++ = xdr_one; /* next */ *p++ = xdr_one; /* next */
...@@ -221,7 +221,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent ...@@ -221,7 +221,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent
readdir->pgbase = (char *)p - (char *)start; readdir->pgbase = (char *)p - (char *)start;
readdir->count -= readdir->pgbase; readdir->count -= readdir->pgbase;
kunmap_atomic(start, KM_USER0); kunmap_atomic(start);
} }
static int nfs4_wait_clnt_recover(struct nfs_client *clp) static int nfs4_wait_clnt_recover(struct nfs_client *clp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment