summaryrefslogtreecommitdiffstats
path: root/src/fuse/main.c
diff options
context:
space:
mode:
authorSimon Rettberg2015-12-01 18:15:32 +0100
committerSimon Rettberg2015-12-01 18:15:32 +0100
commit53dc1d1bcc76c50e956eb57a9a48ed937dff4972 (patch)
tree1b3adbadcec2085bd0ba726daa07b828f3f70da3 /src/fuse/main.c
parent[FUSE] Stability improvements, runs for longer than a couple secs now :) (diff)
downloaddnbd3-53dc1d1bcc76c50e956eb57a9a48ed937dff4972.tar.gz
dnbd3-53dc1d1bcc76c50e956eb57a9a48ed937dff4972.tar.xz
dnbd3-53dc1d1bcc76c50e956eb57a9a48ed937dff4972.zip
[FUSE] Fix losing requests on server change
Diffstat (limited to 'src/fuse/main.c')
-rw-r--r--src/fuse/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/fuse/main.c b/src/fuse/main.c
index 42c3664..f237832 100644
--- a/src/fuse/main.c
+++ b/src/fuse/main.c
@@ -112,8 +112,8 @@ static int image_read(const char *path, char *buf, size_t size, off_t offset, st
}
while ( !request.finished ) {
int ret = signal_wait( request.signalFd, 10000 );
- if ( ret != SIGNAL_OK ) {
- debugf( "signal_wait returned %d", ret );
+ if ( ret < 0 ) {
+ debugf( "fuse_read signal wait returned %d", ret );
}
}
signal_close( request.signalFd );
@@ -190,7 +190,7 @@ exit_usage:
if ( testOpt ) {
/* values for testing. */
- server_address = "132.230.4.1";
+ server_address = "132.230.4.1 132.230.8.113 132.230.4.60";
image_Name = "windows7-umwelt.vmdk";
useLog = true;
}
@@ -199,11 +199,11 @@ exit_usage:
goto exit_usage;
}
- int arg_count = 5;
+ int arg_count = 4;
if ( useDebug ) {
arg_count++;
}
- char *args[6] = {"foo", "-o", "ro,allow_other", "-s", mountPoint, "-d"};
+ char *args[6] = { "foo", "-o", "ro,allow_other,kernel_cache,max_readahead=262144", mountPoint, "-d" };
if ( !connection_init( server_address, image_Name, 0 ) ) {
printf( "Tschüss\n" );