From 0c9a2b14305576621632c7f1399d19dd5c67153f Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 3 Feb 2019 06:23:10 +0100 Subject: [PATCH] Kernel: Oops, I mixed up st_dev and st_rdev in struct stat. --- Kernel/FileDescriptor.cpp | 4 ++-- Userland/ls.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel/FileDescriptor.cpp b/Kernel/FileDescriptor.cpp index 592561b060..b88a5f1789 100644 --- a/Kernel/FileDescriptor.cpp +++ b/Kernel/FileDescriptor.cpp @@ -91,13 +91,13 @@ int FileDescriptor::fstat(stat* buffer) if (!metadata.is_valid()) return -EIO; - buffer->st_dev = encoded_device(metadata.major_device, metadata.minor_device); + buffer->st_rdev = encoded_device(metadata.major_device, metadata.minor_device); buffer->st_ino = metadata.inode.index(); buffer->st_mode = metadata.mode; buffer->st_nlink = metadata.link_count; buffer->st_uid = metadata.uid; buffer->st_gid = metadata.gid; - buffer->st_rdev = 0; // FIXME + buffer->st_dev = 0; // FIXME buffer->st_size = metadata.size; buffer->st_blksize = metadata.block_size; buffer->st_blocks = metadata.block_count; diff --git a/Userland/ls.cpp b/Userland/ls.cpp index 2ce036152f..80ca15bd64 100644 --- a/Userland/ls.cpp +++ b/Userland/ls.cpp @@ -159,7 +159,7 @@ int do_dir(const char* path) printf(" %4u %4u", st.st_uid, st.st_gid); if (S_ISCHR(st.st_mode)) - printf(" %4u,%4u ", major(st.st_dev), minor(st.st_dev)); + printf(" %4u,%4u ", major(st.st_rdev), minor(st.st_rdev)); else printf(" %10u ", st.st_size);