From 242fec23320e09b3d13cdda2a47cee22fef3c896 Mon Sep 17 00:00:00 2001 From: waddlesplash Date: Thu, 8 Sep 2022 18:07:34 +0000 Subject: [PATCH] Revert "bfs: fix alignment of struct dirent" This reverts commit 7fe1087ed4cb54f5e2e5ba3dd3b4b73c7ebc2214. Reason for revert: could cause underflow Change-Id: Ib2263f3ab17ae377b0565d020410bae616385cfe Reviewed-on: https://review.haiku-os.org/c/haiku/+/5577 Reviewed-by: waddlesplash --- src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp index ac027b7569..8d120de691 100644 --- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp @@ -22,10 +22,7 @@ // TODO: temporary solution as long as there is no public I/O requests API #ifndef FS_SHELL # include -# include # include -#else -# include "fssh_kernel_priv.h" #endif @@ -1762,7 +1759,7 @@ bfs_read_dir(fs_volume* _volume, fs_vnode* _node, void* _cookie, dirent->d_dev = volume->ID(); dirent->d_ino = id; - dirent->d_reclen = ROUNDUP(offsetof(struct dirent, d_name) + length + 1, sizeof(void*)); + dirent->d_reclen = offsetof(struct dirent, d_name) + length + 1; bufferSize -= dirent->d_reclen; dirent = (struct dirent*)((uint8*)dirent + dirent->d_reclen);