diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2020-06-22 18:02:59 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2020-06-22 18:02:59 +0300 |
| commit | 6bb43361962ba9cb9d62bf3116bb9f88f8b39260 (patch) | |
| tree | 420eddf465c43193b921ecab06e9211d6400b4bb /src | |
| parent | cd69bf51ca11a102a13ba30c2800ff4d553996bf (diff) | |
| download | nginx-6bb43361962ba9cb9d62bf3116bb9f88f8b39260.tar.gz nginx-6bb43361962ba9cb9d62bf3116bb9f88f8b39260.zip | |
Too large st_blocks values are now ignored (ticket #157).
With XFS, using "allocsize=64m" mount option results in large preallocation
being reported in the st_blocks as returned by fstat() till the file is
closed. This in turn results in incorrect cache size calculations and
wrong clearing based on max_size.
To avoid too aggressive cache clearing on such volumes, st_blocks values
which result in sizes larger than st_size and eight blocks (an arbitrary
limit) are no longer trusted, and we use st_size instead.
The ngx_de_fs_size() counterpart is intentionally not modified, as
it is used on closed files and hence not affected by this problem.
Diffstat (limited to 'src')
| -rw-r--r-- | src/os/unix/ngx_files.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index 383e38e65..3e36984b9 100644 --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -185,7 +185,10 @@ ngx_int_t ngx_set_file_time(u_char *name, ngx_fd_t fd, time_t s); #define ngx_is_exec(sb) (((sb)->st_mode & S_IXUSR) == S_IXUSR) #define ngx_file_access(sb) ((sb)->st_mode & 0777) #define ngx_file_size(sb) (sb)->st_size -#define ngx_file_fs_size(sb) ngx_max((sb)->st_size, (sb)->st_blocks * 512) +#define ngx_file_fs_size(sb) \ + (((sb)->st_blocks * 512 > (sb)->st_size \ + && (sb)->st_blocks * 512 < (sb)->st_size + 8 * (sb)->st_blksize) \ + ? (sb)->st_blocks * 512 : (sb)->st_size) #define ngx_file_mtime(sb) (sb)->st_mtime #define ngx_file_uniq(sb) (sb)->st_ino |