Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
2b86ce2d
Commit
2b86ce2d
authored
Nov 25, 2011
by
Cong Wang
Committed by
Cong Wang
Mar 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nfs: remove the second argument of k[un]map_atomic()
Signed-off-by:
Cong Wang
<
amwang@redhat.com
>
parent
27a6d5c7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
fs/nfs/dir.c
fs/nfs/dir.c
+4
-4
fs/nfs/nfs4proc.c
fs/nfs/nfs4proc.c
+2
-2
No files found.
fs/nfs/dir.c
View file @
2b86ce2d
...
@@ -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
)
{
...
...
fs/nfs/nfs4proc.c
View file @
2b86ce2d
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment