Skip to content

WIP libdiod: fix readdir problem on 32 bit server #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
garlick wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP libdiod: fix readdir problem on 32 bit server #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libdiod/diod_ioctx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ ioctx_seekdir (IOCtx ioctx, long offset)
* taking the lock.
*/
struct dirent *
ioctx_readdir(IOCtx ioctx, long *offset)
ioctx_readdir(IOCtx ioctx, u64 *offset)
{
struct dirent *d;

Expand Down
2 changes: 1 addition & 1 deletion src/libdiod/diod_ioctx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int ioctx_open (Npfid *fid, u32 flags, u32 mode);
int ioctx_close (Npfid *fid, int seterrno);
int ioctx_pread (IOCtx ioctx, void *buf, size_t count, off_t offset);
int ioctx_pwrite (IOCtx ioctx, const void *buf, size_t count, off_t offset);
struct dirent *ioctx_readdir(IOCtx ioctx, long *new_offset);
struct dirent *ioctx_readdir(IOCtx ioctx, u64 *new_offset);
void ioctx_rewinddir (IOCtx ioctx);
void ioctx_seekdir (IOCtx ioctx, long offset);
int ioctx_fsync (IOCtx ioctx, int datasync);
Expand Down
4 changes: 2 additions & 2 deletions src/libdiod/diod_ops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,7 +1141,7 @@ diod_setattr (Npfid *fid, u32 valid, u32 mode, u32 uid, u32 gid, u64 size,
}

static u32
_copy_dirent_linux (Fid *f, struct dirent *d, long offset, u8 *buf, u32 buflen)
_copy_dirent_linux (Fid *f, struct dirent *d, u64 offset, u8 *buf, u32 buflen)
{
Npqid qid;
u32 ret = 0;
Expand Down Expand Up @@ -1169,7 +1169,7 @@ _read_dir_linux (Fid *f, u8* buf, u64 offset, u32 count)
{
struct dirent *d;
int i, n = 0;
long new_offset;
u64 new_offset;

if (offset == 0)
ioctx_rewinddir (f->ioctx);
Expand Down