Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
77736014
Commit
77736014
authored
Oct 01, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lib/nfs/Connection: remove obsolete flag postponed_destroy
parent
aa7774b8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
18 deletions
+2
-18
Connection.cxx
src/lib/nfs/Connection.cxx
+1
-9
Connection.hxx
src/lib/nfs/Connection.hxx
+1
-9
No files found.
src/lib/nfs/Connection.cxx
View file @
77736014
...
@@ -263,7 +263,6 @@ NfsConnection::OnSocketReady(unsigned flags)
...
@@ -263,7 +263,6 @@ NfsConnection::OnSocketReady(unsigned flags)
assert
(
!
in_service
);
assert
(
!
in_service
);
in_service
=
true
;
in_service
=
true
;
postponed_destroy
=
false
;
int
result
=
nfs_service
(
context
,
events_to_libnfs
(
flags
));
int
result
=
nfs_service
(
context
,
events_to_libnfs
(
flags
));
...
@@ -271,14 +270,7 @@ NfsConnection::OnSocketReady(unsigned flags)
...
@@ -271,14 +270,7 @@ NfsConnection::OnSocketReady(unsigned flags)
assert
(
in_service
);
assert
(
in_service
);
in_service
=
false
;
in_service
=
false
;
if
(
postponed_destroy
)
{
if
(
!
was_mounted
&&
mount_finished
)
{
/* somebody has called nfs_client_free() while we were inside
nfs_service() */
const
ScopeLock
protect
(
mutex
);
DestroyContext
();
closed
=
true
;
// TODO? nfs_client_cleanup_files(client);
}
else
if
(
!
was_mounted
&&
mount_finished
)
{
const
ScopeLock
protect
(
mutex
);
const
ScopeLock
protect
(
mutex
);
if
(
postponed_mount_error
.
IsDefined
())
{
if
(
postponed_mount_error
.
IsDefined
())
{
...
...
src/lib/nfs/Connection.hxx
View file @
77736014
...
@@ -75,9 +75,7 @@ class NfsConnection : SocketMonitor, DeferredMonitor {
...
@@ -75,9 +75,7 @@ class NfsConnection : SocketMonitor, DeferredMonitor {
Error
postponed_mount_error
;
Error
postponed_mount_error
;
/**
/**
* True when nfs_service() is being called. During that,
* True when nfs_service() is being called.
* nfs_client_free() is postponed, or libnfs will crash. See
* #postponed_destroy.
*/
*/
bool
in_service
;
bool
in_service
;
...
@@ -87,12 +85,6 @@ class NfsConnection : SocketMonitor, DeferredMonitor {
...
@@ -87,12 +85,6 @@ class NfsConnection : SocketMonitor, DeferredMonitor {
*/
*/
bool
in_event
;
bool
in_event
;
/**
* True when nfs_client_free() has been called while #in_service
* was true.
*/
bool
postponed_destroy
;
bool
mount_finished
;
bool
mount_finished
;
public
:
public
:
...
...
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