mirror of
https://github.com/nginx/nginx.git
synced 2025-02-25 18:55:26 -06:00
compatibility with Tru64 UNIX: fcntl(F_SETLK, F_WRLCK) returns EINVAL if busy
This commit is contained in:
parent
6d94b51f0b
commit
da0a5318f1
@ -57,7 +57,15 @@ ngx_shmtx_trylock(ngx_shmtx_t *mtx)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ngx_log_abort(err, ngx_trylock_fd_n " failed");
|
#if __osf__ /* Tru64 UNIX */
|
||||||
|
|
||||||
|
if (err == NGX_EACCESS) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
ngx_log_abort(err, ngx_trylock_fd_n " %s failed", mtx->name);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -74,7 +82,7 @@ ngx_shmtx_lock(ngx_shmtx_t *mtx)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ngx_log_abort(err, ngx_lock_fd_n " failed");
|
ngx_log_abort(err, ngx_lock_fd_n " %s failed", mtx->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -89,7 +97,7 @@ ngx_shmtx_unlock(ngx_shmtx_t *mtx)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ngx_log_abort(err, ngx_unlock_fd_n " failed");
|
ngx_log_abort(err, ngx_unlock_fd_n " %s failed", mtx->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user