commit 77cdae1814d6d359febee8c85edd1f2671869db4
author Igor Sysoev <igor@sysoev.ru> Fri Sep 12 13:39:51 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Fri Sep 12 13:39:51 2008 +0000
tree 5b80bf0b6e90b56810f7461f78fe8786ff8ff072
parent d0df295655ea9e44cca9e4a51f5712a6d2d0fc31

cache directio flag in open file cache

src/core/ngx_open_file_cache.c

diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c
index 614484d..f9c6a45 100644
--- a/src/core/ngx_open_file_cache.c
+++ b/src/core/ngx_open_file_cache.c
@@ -205,6 +205,7 @@
                 of->is_file = file->is_file;
                 of->is_link = file->is_link;
                 of->is_exec = file->is_exec;
+                of->is_directio = file->is_directio;
 
                 if (!file->is_dir) {
                     file->count++;
@@ -360,6 +361,7 @@
         file->is_file = of->is_file;
         file->is_link = of->is_link;
         file->is_exec = of->is_exec;
+        file->is_directio = of->is_directio;
 
         if (!of->is_dir) {
             file->count++;
@@ -499,9 +501,9 @@
         of->fd = fd;
 
         if (of->directio <= ngx_file_size(&fi)) {
-            if (ngx_directio(fd) == -1) {
+            if (ngx_directio_on(fd) == -1) {
                 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
-                              ngx_directio_n " \"%s\" failed", name);
+                              ngx_directio_on_n " \"%s\" failed", name);
 
             } else {
                 of->is_directio = 1;

src/core/ngx_open_file_cache.h

diff --git a/src/core/ngx_open_file_cache.h b/src/core/ngx_open_file_cache.h
index b15de1d..af39094 100644
--- a/src/core/ngx_open_file_cache.h
+++ b/src/core/ngx_open_file_cache.h
@@ -63,6 +63,7 @@
     unsigned                 is_file:1;
     unsigned                 is_link:1;
     unsigned                 is_exec:1;
+    unsigned                 is_directio:1;
 
     ngx_event_t             *event;
 };