Skip to content

W
wine-winehq
Commit b932723a authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Ignore locking failures caused by missing NFS locking daemon.

Handle EINVAL the same way as EOVERFLOW.
parent bad47392
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
server/fd.c
View file @ b932723a
...@@ -478,6 +478,10 @@ static int set_unix_lock( const struct fd *fd, file_pos_t start, file_pos_t end, ...@@ -478,6 +478,10 @@ static int set_unix_lock( const struct fd *fd, file_pos_t start, file_pos_t end,
switch(errno) switch(errno)
{ {
case EIO:
case ENOLCK:
/* no locking on this fs, just ignore it */
return 1;
case EACCES: case EACCES:
case EAGAIN: case EAGAIN:
set_error( STATUS_FILE_LOCK_CONFLICT ); set_error( STATUS_FILE_LOCK_CONFLICT );
...@@ -489,6 +493,7 @@ static int set_unix_lock( const struct fd *fd, file_pos_t start, file_pos_t end, ...@@ -489,6 +493,7 @@ static int set_unix_lock( const struct fd *fd, file_pos_t start, file_pos_t end,
set_error( STATUS_ACCESS_DENIED ); set_error( STATUS_ACCESS_DENIED );
return 0; return 0;
case EOVERFLOW: case EOVERFLOW:
case EINVAL:
/* this can happen if off_t is 64-bit but the kernel only supports 32-bit */ /* this can happen if off_t is 64-bit but the kernel only supports 32-bit */
/* in that case we shrink the limit and retry */ /* in that case we shrink the limit and retry */
if (max_unix_offset > INT_MAX) if (max_unix_offset > INT_MAX)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment