From: Maxim Dounin <mdounin@mdounin.ru>
Date: Mon, 5 Sep 2011 16:36:19 +0000 (+0000)
Subject: Bugfix: open_file_cache lost is_directio flag.
X-Git-Tag: release-1.1.3~26
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=4f65a05d1819392acdef365f387fa078baaabaab;p=nginx.git

Bugfix: open_file_cache lost is_directio flag.

On file retest open_file_cache lost is_directio if file wasn't changed.
This caused unaligned operations under Linux to fail with EINVAL.
It wasn't noticeable with AIO though, as errors wasn't properly logged.
---

diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c
index a70385c35..1cce9e92b 100644
--- a/src/core/ngx_open_file_cache.c
+++ b/src/core/ngx_open_file_cache.c
@@ -290,6 +290,8 @@ ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name,
                     file->use_event = 1;
                 }
 
+                of->is_directio = file->is_directio;
+
                 goto renew;
             }
 
diff --git a/src/os/unix/ngx_file_aio_read.c b/src/os/unix/ngx_file_aio_read.c
index ef7a46107..557f9de6a 100644
--- a/src/os/unix/ngx_file_aio_read.c
+++ b/src/os/unix/ngx_file_aio_read.c
@@ -86,6 +86,9 @@ ngx_file_aio_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset,
             return aio->nbytes;
         }
 
+        ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
+                      "aio read \"%s\" failed", file->name.data);
+
         return NGX_ERROR;
     }
 
diff --git a/src/os/unix/ngx_linux_aio_read.c b/src/os/unix/ngx_linux_aio_read.c
index 72875ca01..b9d1d01cd 100644
--- a/src/os/unix/ngx_linux_aio_read.c
+++ b/src/os/unix/ngx_linux_aio_read.c
@@ -74,6 +74,10 @@ ngx_file_aio_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset,
         }
 
         ngx_set_errno(-aio->res);
+
+        ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
+                      "aio read \"%s\" failed", file->name.data);
+
         return NGX_ERROR;
     }