Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: Renaming variables and bug fix in read_dir

Browse Source 
Main issue was use of sizeof(dirent) instead of sizeof(struct dirent).
It didn't cause any issue before but I found it ambiguous. Also, renamed
the dirent variable to buffer to remove any ambiguity.

Change-Id: I36ab40eea354424a4fddc3292ee7e1aaed446859
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3198
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
CruxBox 2020-09-08 15:12:09 +05:30 committed by Adrien Destugues
parent 00866cc149
commit a20b880907
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/add-ons/kernel/file_systems/xfs/kernel_interface.cpp
View File

@ -369,7 +369,7 @@ xfs_open_dir(fs_volume * /*_volume*/, fs_vnode *_node, void **_cookie)
static status_t
xfs_read_dir(fs_volume *_volume, fs_vnode *_node, void *_cookie,
struct dirent *dirent, size_t bufferSize, uint32 *_num)
struct dirent *buffer, size_t bufferSize, uint32 *_num)
{
TRACE("XFS_READ_DIR\n");
DirectoryIterator* iterator = (DirectoryIterator*)_cookie;
@ -378,11 +378,11 @@ xfs_read_dir(fs_volume *_volume, fs_vnode *_node, void *_cookie,
uint32 maxCount = *_num;
uint32 count = 0;
while (count < maxCount and (bufferSize > sizeof(struct dirent))) {
while (count < maxCount && (bufferSize > sizeof(struct dirent))) {
size_t length = bufferSize - sizeof(struct dirent) + 1;
xfs_ino_t ino;
status_t status = iterator->GetNext(dirent->d_name, &length, &ino);
status_t status = iterator->GetNext(buffer->d_name, &length, &ino);
if (status == B_ENTRY_NOT_FOUND)
break;
if (status == B_BUFFER_OVERFLOW) {
@ -393,11 +393,11 @@ xfs_read_dir(fs_volume *_volume, fs_vnode *_node, void *_cookie,
if (status != B_OK)
return status;
dirent->d_dev = volume->ID();
dirent->d_ino = ino;
dirent->d_reclen = sizeof(dirent) + length;
bufferSize -= dirent->d_reclen;
dirent = (struct dirent*)((uint8*)dirent + dirent->d_reclen);
buffer->d_dev = volume->ID();
buffer->d_ino = ino;
buffer->d_reclen = sizeof(struct dirent) + length;
bufferSize -= buffer->d_reclen;
buffer = (struct dirent*)((uint8*)buffer + buffer->d_reclen);
count++;
}