diff --git a/src/libdiod/diod_ioctx.c b/src/libdiod/diod_ioctx.c
index 5dca9c91..adb9461a 100644
--- a/src/libdiod/diod_ioctx.c
+++ b/src/libdiod/diod_ioctx.c
@@ -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;
 
diff --git a/src/libdiod/diod_ioctx.h b/src/libdiod/diod_ioctx.h
index 55ab6177..3c3d62ec 100644
--- a/src/libdiod/diod_ioctx.h
+++ b/src/libdiod/diod_ioctx.h
@@ -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);
diff --git a/src/libdiod/diod_ops.c b/src/libdiod/diod_ops.c
index daa19724..3b57fcc6 100644
--- a/src/libdiod/diod_ops.c
+++ b/src/libdiod/diod_ops.c
@@ -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;
@@ -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);