i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FUSEVolume: Add a ROUNDUP() macro and use it.

Browse Source 
No functional change intended, but this should make the code
easier to read.
This commit is contained in:
Augustin Cavalier
2021-11-18 16:35:31 -05:00
parent afcfd3c5d5
commit d9df256704
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp
+5 -3
View File
@@ -20,6 +20,8 @@
#include "../kernel_emu.h" #include "../kernel_emu.h"
#include "../RequestThread.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 // 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 // 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 // align the size, if requested
if (align) if (align)
size = std::min(bufferSize, (size + 7) / 8 * 8); size = std::min(bufferSize, ROUNDUP(size, 8));
// fill in the dirent // fill in the dirent
buffer->d_dev = volumeID; buffer->d_dev = volumeID;
@@ -254,7 +256,7 @@ struct FUSEVolume::AttrDirCookie : RWLockable {
// align the size, if requested // align the size, if requested
if (align) if (align)
size = std::min(bufferSize, (size + 7) / 8 * 8); size = std::min(bufferSize, ROUNDUP(size, 8));
// fill in the dirent // fill in the dirent
buffer->d_dev = volumeID; buffer->d_dev = volumeID;
@@ -3106,7 +3108,7 @@ FUSEVolume::_AddReadDirEntry(ReadDirBuffer* buffer, const char* name, int type,
if (buffer->entriesRead + 1 < buffer->maxEntries) { if (buffer->entriesRead + 1 < buffer->maxEntries) {
// align the entry length, so the next dirent will be aligned // align the entry length, so the next dirent will be aligned
entryLen = (entryLen + 7) / 8 * 8; entryLen = ROUNDUP(entryLen, 8);
entryLen = std::min(entryLen, entryLen = std::min(entryLen,
buffer->bufferSize - buffer->usedSize); buffer->bufferSize - buffer->usedSize);
} }