Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
wendelin.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Kirill Smelkov
wendelin.core
Commits
f4e73727
Commit
f4e73727
authored
Feb 17, 2020
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
96b16e82
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
wcfs/client/wcfs.cpp
wcfs/client/wcfs.cpp
+10
-2
No files found.
wcfs/client/wcfs.cpp
View file @
f4e73727
...
@@ -264,6 +264,15 @@ error _Conn::__pin1(PinReq *req) {
...
@@ -264,6 +264,15 @@ error _Conn::__pin1(PinReq *req) {
error
err
;
error
err
;
if
(
mmap
->
vma
!=
nil
)
{
if
(
mmap
->
vma
!=
nil
)
{
mmap
->
_assertVMAOk
();
mmap
->
_assertVMAOk
();
// XXX recheck wrt Mapping.unmap: there it locks:
// 1. virt_lock
// 2. f.mu
//
// -> if here we do
// 1. f.mu
// 2. virt_lock
//
// -> deadlock
virt_lock
();
virt_lock
();
BigFileH
*
virt_fileh
=
mmap
->
vma
->
fileh
;
BigFileH
*
virt_fileh
=
mmap
->
vma
->
fileh
;
TODO
(
mmap
->
fileh
->
blksize
!=
virt_fileh
->
ramh
->
ram
->
pagesize
);
TODO
(
mmap
->
fileh
->
blksize
!=
virt_fileh
->
ramh
->
ram
->
pagesize
);
...
@@ -504,9 +513,8 @@ error _Mapping::unmap() {
...
@@ -504,9 +513,8 @@ error _Mapping::unmap() {
mmap
->
mem_stop
=
nil
;
mmap
->
mem_stop
=
nil
;
// XXX clear other fields?
// XXX clear other fields?
// XXX do it first? (to avoid pinner going through f.mmaps and hitting unmapped memory)
//f->_mmaps.remove(mmap);
//f->_mmaps.remove(mmap);
// FIXME keep mmaps sorted
f
->
_mmaps
.
erase
(
f
->
_mmaps
.
erase
(
std
::
remove
(
f
->
_mmaps
.
begin
(),
f
->
_mmaps
.
end
(),
mmap
),
std
::
remove
(
f
->
_mmaps
.
begin
(),
f
->
_mmaps
.
end
(),
mmap
),
f
->
_mmaps
.
end
());
f
->
_mmaps
.
end
());
...
...
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