Skip to content

gh-83714: Only use STATX_MNT_ID & STATX_SUBVOL if they're defined #140446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 3 commits into from
Oct 22, 2025
Merged

gh-83714: Only use STATX_MNT_ID & STATX_SUBVOL if they're defined #140446

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e879800
gh-83714: Only use STATX_MNT_ID & STATX_SUBVOL if they're defined
encukou Oct 22, 2025
f0d5edb
Also guard G
encukou Oct 22, 2025
0c95f7a
Merge in the main branch
encukou Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge in the main branch
  • Loading branch information
@encukou
encukou committed Oct 22, 2025
commit 0c95f7a7883ab9aff58445446cbe6f9cef701d0f
38 changes: 19 additions & 19 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3393,14 +3393,14 @@ STATX_GET_UINT(stx_atomic_write_unit_max_opt, STATX_WRITE_ATOMIC)
return PyLong_FromUnsignedLongLong(value); \
}

STATX_GET_ULONGLONG(st_blocks, stx_blocks, STATX_BLOCKS)
STATX_GET_ULONGLONG(st_ino, stx_ino, STATX_INO)
STATX_GET_ULONGLONG(st_size, stx_size, STATX_SIZE)
STATX_GET_ULONGLONG(stx_blocks, STATX_BLOCKS)
STATX_GET_ULONGLONG(stx_ino, STATX_INO)
STATX_GET_ULONGLONG(stx_size, STATX_SIZE)
#if defined(STATX_MNT_ID) && defined(HAVE_STRUCT_STATX_STX_MNT_ID)
STATX_GET_ULONGLONG(stx_mnt_id, stx_mnt_id, STATX_MNT_ID)
STATX_GET_ULONGLONG(stx_mnt_id, STATX_MNT_ID)
#endif
#if defined(STATX_SUBVOL) && defined(HAVE_STRUCT_STATX_STX_SUBVOL)
STATX_GET_ULONGLONG(stx_subvol, stx_subvol, STATX_SUBVOL)
STATX_GET_ULONGLONG(stx_subvol, STATX_SUBVOL)
#endif


Expand Down Expand Up @@ -3444,20 +3444,20 @@ STATX_GET_NSEC(stx_mtime_ns, stx_mtime, STATX_MTIME)
{#attr, pystatx_result_get_##attr, NULL, PyDoc_STR(doc), NULL}

static PyGetSetDef pystatx_result_getset[] = {
G(st_nlink, "number of hard links"),
G(st_uid, "user ID of owner"),
G(st_gid, "group ID of owner"),
G(st_ino, "inode"),
G(st_size, "total size, in bytes"),
G(st_blocks, "number of blocks allocated"),
G(st_atime, "time of last access"),
G(st_atime_ns, "time of last access in nanoseconds"),
G(st_birthtime, "time of creation"),
G(st_birthtime_ns, "time of creation in nanoseconds"),
G(st_ctime, "time of last change"),
G(st_ctime_ns, "time of last change in nanoseconds"),
G(st_mtime, "time of last modification"),
G(st_mtime_ns, "time of last modification in nanoseconds"),
G(stx_nlink, "number of hard links"),
G(stx_uid, "user ID of owner"),
G(stx_gid, "group ID of owner"),
G(stx_ino, "inode"),
G(stx_size, "total size, in bytes"),
G(stx_blocks, "number of blocks allocated"),
G(stx_atime, "time of last access"),
G(stx_atime_ns, "time of last access in nanoseconds"),
G(stx_btime, "time of creation"),
G(stx_btime_ns, "time of creation in nanoseconds"),
G(stx_ctime, "time of last change"),
G(stx_ctime_ns, "time of last change in nanoseconds"),
G(stx_mtime, "time of last modification"),
G(stx_mtime_ns, "time of last modification in nanoseconds"),
#if defined(STATX_MNT_ID) && defined(HAVE_STRUCT_STATX_STX_MNT_ID)
G(stx_mnt_id, "mount ID"),
#endif
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.