From d9df25670400a0dd7c34e568441cc39530f75d1a Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 18 Nov 2021 16:35:31 -0500 Subject: [PATCH] FUSEVolume: Add a ROUNDUP() macro and use it. No functional change intended, but this should make the code easier to read. --- .../file_systems/userlandfs/server/fuse/FUSEVolume.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp index ebdda03771..6fe9c4ac5c 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp @@ -20,6 +20,8 @@ #include "../kernel_emu.h" #include "../RequestThread.h" +#define ROUNDUP(a, b) (((a) + ((b)-1)) & ~((b)-1)) + // TODO: For remote/shared file systems (sshfs, nfs, etc.) we need to notice // that entries have been added/removed, so that we can (1) update our @@ -110,7 +112,7 @@ struct FUSEVolume::DirEntryCache { // align the size, if requested if (align) - size = std::min(bufferSize, (size + 7) / 8 * 8); + size = std::min(bufferSize, ROUNDUP(size, 8)); // fill in the dirent buffer->d_dev = volumeID; @@ -254,7 +256,7 @@ struct FUSEVolume::AttrDirCookie : RWLockable { // align the size, if requested if (align) - size = std::min(bufferSize, (size + 7) / 8 * 8); + size = std::min(bufferSize, ROUNDUP(size, 8)); // fill in the dirent buffer->d_dev = volumeID; @@ -3106,7 +3108,7 @@ FUSEVolume::_AddReadDirEntry(ReadDirBuffer* buffer, const char* name, int type, if (buffer->entriesRead + 1 < buffer->maxEntries) { // align the entry length, so the next dirent will be aligned - entryLen = (entryLen + 7) / 8 * 8; + entryLen = ROUNDUP(entryLen, 8); entryLen = std::min(entryLen, buffer->bufferSize - buffer->usedSize); }