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
53b55e55
Commit
53b55e55
authored
Nov 25, 2011
by
Cong Wang
Committed by
Cong Wang
Mar 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
squashfs: remove the second argument of k[un]map_atomic()
Signed-off-by:
Cong Wang
<
amwang@redhat.com
>
parent
883da600
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
fs/squashfs/file.c
fs/squashfs/file.c
+4
-4
fs/squashfs/symlink.c
fs/squashfs/symlink.c
+2
-2
No files found.
fs/squashfs/file.c
View file @
53b55e55
...
...
@@ -464,10 +464,10 @@ static int squashfs_readpage(struct file *file, struct page *page)
if
(
PageUptodate
(
push_page
))
goto
skip_page
;
pageaddr
=
kmap_atomic
(
push_page
,
KM_USER0
);
pageaddr
=
kmap_atomic
(
push_page
);
squashfs_copy_data
(
pageaddr
,
buffer
,
offset
,
avail
);
memset
(
pageaddr
+
avail
,
0
,
PAGE_CACHE_SIZE
-
avail
);
kunmap_atomic
(
pageaddr
,
KM_USER0
);
kunmap_atomic
(
pageaddr
);
flush_dcache_page
(
push_page
);
SetPageUptodate
(
push_page
);
skip_page:
...
...
@@ -484,9 +484,9 @@ static int squashfs_readpage(struct file *file, struct page *page)
error_out:
SetPageError
(
page
);
out:
pageaddr
=
kmap_atomic
(
page
,
KM_USER0
);
pageaddr
=
kmap_atomic
(
page
);
memset
(
pageaddr
,
0
,
PAGE_CACHE_SIZE
);
kunmap_atomic
(
pageaddr
,
KM_USER0
);
kunmap_atomic
(
pageaddr
);
flush_dcache_page
(
page
);
if
(
!
PageError
(
page
))
SetPageUptodate
(
page
);
...
...
fs/squashfs/symlink.c
View file @
53b55e55
...
...
@@ -90,14 +90,14 @@ static int squashfs_symlink_readpage(struct file *file, struct page *page)
goto
error_out
;
}
pageaddr
=
kmap_atomic
(
page
,
KM_USER0
);
pageaddr
=
kmap_atomic
(
page
);
copied
=
squashfs_copy_data
(
pageaddr
+
bytes
,
entry
,
offset
,
length
-
bytes
);
if
(
copied
==
length
-
bytes
)
memset
(
pageaddr
+
length
,
0
,
PAGE_CACHE_SIZE
-
length
);
else
block
=
entry
->
next_index
;
kunmap_atomic
(
pageaddr
,
KM_USER0
);
kunmap_atomic
(
pageaddr
);
squashfs_cache_put
(
entry
);
}
...
...
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