Commit e77dd8d
fs: expose frsize field in statfs
Expose `f_frsize` from libuv's `uv_statfs_t` as `statfs.frsize`.
Per POSIX, `f_blocks`, `f_bfree`, and `f_bavail` are expressed in
units of `f_frsize`, not `f_bsize`. On most filesystems the two
values are typically equal, but some filesystem drivers report a
different `f_bsize`, making it impossible to compute accurate disk
usage without `frsize`.
Refs: libuv/libuv#4983
PR-URL: #62277
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>1 parent 83b594a commit e77dd8d
6 files changed
Lines changed: 19 additions & 3 deletions
File tree
- doc/api
- lib/internal/fs
- src
- test/parallel
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7556,6 +7556,7 @@ numeric values will be `bigint` instead of `number`. | |||
| 7556 | 7556 | StatFs { | |
| 7557 | 7557 | type: 1397114950, | |
| 7558 | 7558 | bsize: 4096, | |
| 7559 | + frsize: 4096, | ||
| 7559 | 7560 | blocks: 121938943, | |
| 7560 | 7561 | bfree: 61058895, | |
| 7561 | 7562 | bavail: 61058895, | |
@@ -7570,6 +7571,7 @@ StatFs { | |||
| 7570 | 7571 | StatFs { | |
| 7571 | 7572 | type: 1397114950n, | |
| 7572 | 7573 | bsize: 4096n, | |
| 7574 | + frsize: 4096n, | ||
| 7573 | 7575 | blocks: 121938943n, | |
| 7574 | 7576 | bfree: 61058895n, | |
| 7575 | 7577 | bavail: 61058895n, | |
@@ -7626,6 +7628,16 @@ added: | |||
| 7626 | 7628 | ||
| 7627 | 7629 | Optimal transfer block size. | |
| 7628 | 7630 | ||
| 7631 | + #### `statfs.frsize` | ||
| 7632 | + | ||
| 7633 | + <!-- YAML | ||
| 7634 | + added: REPLACEME | ||
| 7635 | + --> | ||
| 7636 | + | ||
| 7637 | + * Type: {number|bigint} | ||
| 7638 | + | ||
| 7639 | + Fundamental file system block size. | ||
| 7640 | + | ||
| 7629 | 7641 | #### `statfs.ffree` | |
| 7630 | 7642 | ||
| 7631 | 7643 | <!-- YAML | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -575,9 +575,10 @@ function getStatsFromBinding(stats, offset = 0) { | |||
| 575 | 575 | } | |
| 576 | 576 | ||
| 577 | 577 | class StatFs { | |
| 578 | - constructor(type, bsize, blocks, bfree, bavail, files, ffree) { | ||
| 578 | + constructor(type, bsize, frsize, blocks, bfree, bavail, files, ffree) { | ||
| 579 | 579 | this.type = type; | |
| 580 | 580 | this.bsize = bsize; | |
| 581 | + this.frsize = frsize; | ||
| 581 | 582 | this.blocks = blocks; | |
| 582 | 583 | this.bfree = bfree; | |
| 583 | 584 | this.bavail = bavail; | |
@@ -588,7 +589,7 @@ class StatFs { | |||
| 588 | 589 | ||
| 589 | 590 | function getStatFsFromBinding(stats) { | |
| 590 | 591 | return new StatFs( | |
| 591 | - stats[0], stats[1], stats[2], stats[3], stats[4], stats[5], stats[6], | ||
| 592 | + stats[0], stats[1], stats[2], stats[3], stats[4], stats[5], stats[6], stats[7], | ||
| 592 | 593 | ); | |
| 593 | 594 | } | |
| 594 | 595 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -153,6 +153,7 @@ void FillStatFsArray(AliasedBufferBase<NativeT, V8T>* fields, | |||
| 153 | 153 | ||
| 154 | 154 | SET_FIELD(kType, s->f_type); | |
| 155 | 155 | SET_FIELD(kBSize, s->f_bsize); | |
| 156 | + SET_FIELD(kFrSize, s->f_frsize); | ||
| 156 | 157 | SET_FIELD(kBlocks, s->f_blocks); | |
| 157 | 158 | SET_FIELD(kBFree, s->f_bfree); | |
| 158 | 159 | SET_FIELD(kBAvail, s->f_bavail); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -44,6 +44,7 @@ constexpr size_t kFsStatsBufferLength = | |||
| 44 | 44 | enum class FsStatFsOffset { | |
| 45 | 45 | kType = 0, | |
| 46 | 46 | kBSize, | |
| 47 | + kFrSize, | ||
| 47 | 48 | kBlocks, | |
| 48 | 49 | kBFree, | |
| 49 | 50 | kBAvail, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -89,6 +89,7 @@ function verifyStatFsObject(stat, isBigint = false) { | |||
| 89 | 89 | assert.strictEqual(typeof stat, 'object'); | |
| 90 | 90 | assert.strictEqual(typeof stat.type, valueType); | |
| 91 | 91 | assert.strictEqual(typeof stat.bsize, valueType); | |
| 92 | + assert.strictEqual(typeof stat.frsize, valueType); | ||
| 92 | 93 | assert.strictEqual(typeof stat.blocks, valueType); | |
| 93 | 94 | assert.strictEqual(typeof stat.bfree, valueType); | |
| 94 | 95 | assert.strictEqual(typeof stat.bavail, valueType); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,7 +7,7 @@ function verifyStatFsObject(statfs, isBigint = false) { | |||
| 7 | 7 | const valueType = isBigint ? 'bigint' : 'number'; | |
| 8 | 8 | ||
| 9 | 9 | [ | |
| 10 | - 'type', 'bsize', 'blocks', 'bfree', 'bavail', 'files', 'ffree', | ||
| 10 | + 'type', 'bsize', 'frsize', 'blocks', 'bfree', 'bavail', 'files', 'ffree', | ||
| 11 | 11 | ].forEach((k) => { | |
| 12 | 12 | assert.ok(Object.hasOwn(statfs, k)); | |
| 13 | 13 | assert.strictEqual(typeof statfs[k], valueType, | |
0 commit comments