mirror of
https://github.com/nginx/nginx.git
synced 2025-01-19 01:42:58 +08:00
uniform ngx_directio_on/off() interface with other file functions
This commit is contained in:
parent
38a7faadfe
commit
48a28e2dad
@ -525,7 +525,7 @@ ngx_open_and_stat_file(u_char *name, ngx_open_file_info_t *of, ngx_log_t *log)
|
||||
of->fd = fd;
|
||||
|
||||
if (of->directio <= ngx_file_size(&fi)) {
|
||||
if (ngx_directio_on(fd) == -1) {
|
||||
if (ngx_directio_on(fd) == NGX_FILE_ERROR) {
|
||||
ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
|
||||
ngx_directio_on_n " \"%s\" failed", name);
|
||||
|
||||
|
@ -514,7 +514,7 @@ ngx_output_chain_copy_buf(ngx_output_chain_ctx_t *ctx)
|
||||
#if (NGX_HAVE_ALIGNED_DIRECTIO)
|
||||
|
||||
if (ctx->unaligned) {
|
||||
if (ngx_directio_off(src->file->fd) == -1) {
|
||||
if (ngx_directio_off(src->file->fd) == NGX_FILE_ERROR) {
|
||||
ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, ngx_errno,
|
||||
ngx_directio_off_n " \"%s\" failed",
|
||||
src->file->name.data);
|
||||
@ -550,7 +550,7 @@ ngx_output_chain_copy_buf(ngx_output_chain_ctx_t *ctx)
|
||||
|
||||
err = ngx_errno;
|
||||
|
||||
if (ngx_directio_on(src->file->fd) == -1) {
|
||||
if (ngx_directio_on(src->file->fd) == NGX_FILE_ERROR) {
|
||||
ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, ngx_errno,
|
||||
ngx_directio_on_n " \"%s\" failed",
|
||||
src->file->name.data);
|
||||
|
@ -406,7 +406,7 @@ ngx_directio_on(ngx_fd_t fd)
|
||||
flags = fcntl(fd, F_GETFL);
|
||||
|
||||
if (flags == -1) {
|
||||
return -1;
|
||||
return NGX_FILE_ERROR;
|
||||
}
|
||||
|
||||
return fcntl(fd, F_SETFL, flags | O_DIRECT);
|
||||
@ -421,7 +421,7 @@ ngx_directio_off(ngx_fd_t fd)
|
||||
flags = fcntl(fd, F_GETFL);
|
||||
|
||||
if (flags == -1) {
|
||||
return -1;
|
||||
return NGX_FILE_ERROR;
|
||||
}
|
||||
|
||||
return fcntl(fd, F_SETFL, flags & ~O_DIRECT);
|
||||
|
@ -479,14 +479,14 @@ ngx_de_link_info(u_char *name, ngx_dir_t *dir)
|
||||
ngx_int_t
|
||||
ngx_directio_on(ngx_fd_t fd)
|
||||
{
|
||||
return 0;
|
||||
return ~NGX_FILE_ERROR;
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_directio_off(ngx_fd_t fd)
|
||||
{
|
||||
return 0;
|
||||
return ~NGX_FILE_ERROR;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user