From bdac0fc52b2e99accda9c6e56f8af180c8cb3a93 Mon Sep 17 00:00:00 2001
From: shinyquagsire23 <mtinc2@gmail.com>
Date: Sat, 8 Oct 2016 01:36:59 -0600
Subject: [PATCH 1/2] Allocate FSCmdBlock per-operation to avoid sharing
 conflicts between threads

---
 crt/fs_dev.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 116 insertions(+), 6 deletions(-)

diff --git a/crt/fs_dev.c b/crt/fs_dev.c
index cb7ab62..84bde47 100644
--- a/crt/fs_dev.c
+++ b/crt/fs_dev.c
@@ -109,9 +109,6 @@ fs_devoptab =
 FSClient *
 fsClient = NULL;
 
-FSCmdBlock *
-fsCmd = NULL;
-
 static bool fsInitialised = false;
 
 /* Initialize device */
@@ -125,7 +122,7 @@ fsDevInit()
    }
 
    fsClient = memalign(0x20, sizeof(FSClient));
-   fsCmd    = memalign(0x20, sizeof(FSCmdBlock));
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
    FSMountSource mountSource;
    char mountPath[0x80];
    char workDir[0x83];
@@ -171,6 +168,8 @@ fsDevInit()
       }
    }
 
+   free(fsCmd);
+
    return rc;
 }
 
@@ -188,7 +187,7 @@ fs_fixpath(struct _reent *r,
       r->_errno = ENAMETOOLONG;
       return NULL;
    }
-   
+
    char *__fixedpath = memalign(0x40, PATH_MAX+1);
 
    if (__fixedpath == NULL) {
@@ -222,7 +221,6 @@ fsDevExit()
 
    FSDelClient(fsClient, -1);
    free(fsClient);
-   free(fsCmd);
    return rc;
 }
 
@@ -276,6 +274,10 @@ fs_open(struct _reent *r,
    }
    */
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    // Open the file
    rc = FSOpenFile(fsClient, fsCmd, path_fixed, fs_mode, &fd, -1);
 
@@ -284,9 +286,11 @@ fs_open(struct _reent *r,
       file->flags = (flags & (O_ACCMODE|O_APPEND|O_SYNC));
       FSGetPosFile(fsClient, fsCmd, fd, &file->offset, -1);
       free(path_fixed);
+      free(fsCmd);
       return 0;
    }
 
+   free(fsCmd);
    free(path_fixed);
    r->_errno = fs_translate_error(rc);
    return -1;
@@ -299,7 +303,12 @@ fs_close(struct _reent *r,
    FSStatus rc;
    fs_file_t *file = (fs_file_t*)fd;
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    rc = FSCloseFile(fsClient, fsCmd, file->fd, -1);
+   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -338,8 +347,13 @@ fs_write(struct _reent *r,
       // Copy to internal buffer
       memcpy(tmp_buffer, ptr, toWrite);
 
+      // Set up command block
+      FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+      FSInitCmdBlock(fsCmd);
+
       // Write the data
       rc = FSWriteFile(fsClient, fsCmd, tmp_buffer, 1, toWrite, file->fd, 0, -1);
+      free(fsCmd);
 
       if(rc < 0) {
          free(tmp_buffer);
@@ -394,8 +408,13 @@ fs_write_safe(struct _reent *r,
       // Copy to internal buffer
       memcpy(tmp_buffer, ptr, toWrite);
 
+      // Set up command block
+      FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+      FSInitCmdBlock(fsCmd);
+
       // Write the data
       rc = FSWriteFile(fsClient, fsCmd, tmp_buffer, 1, toWrite, file->fd, 0, -1);
+      free(fsCmd);
 
       if (rc < 0) {
          free(tmp_buffer);
@@ -437,11 +456,16 @@ fs_read(struct _reent *r,
       return -1;
    }
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    FSStat fsstat;
    rc = FSGetStatFile(fsClient, fsCmd, file->fd, &fsstat, -1);
 
    if(rc < 0) {
       r->_errno = fs_translate_error(rc);
+      free(fsCmd);
       return -1;
    }
 
@@ -461,6 +485,7 @@ fs_read(struct _reent *r,
       if(rc <= 0)
       {
          free(tmp_buffer);
+         free(fsCmd);
 
          // Return partial transfer
          if (bytesRead > 0) {
@@ -482,6 +507,7 @@ fs_read(struct _reent *r,
       len          -= bytes;
    }
 
+   free(fsCmd);
    free(tmp_buffer);
    return bytesRead;
 }
@@ -496,11 +522,16 @@ fs_seek(struct _reent *r,
    u64 offset;
    fs_file_t *file = (fs_file_t*)fd;
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    FSStat fsstat;
    rc = FSGetStatFile(fsClient, fsCmd, file->fd, &fsstat, -1);
 
    if (rc < 0) {
       r->_errno = fs_translate_error(rc);
+      free(fsCmd);
       return -1;
    }
 
@@ -524,6 +555,7 @@ fs_seek(struct _reent *r,
    // An invalid option was provided
    default:
       r->_errno = EINVAL;
+      free(fsCmd);
       return -1;
    }
 
@@ -531,12 +563,14 @@ fs_seek(struct _reent *r,
    if(pos < 0 && offset < -pos) {
       // Don't allow seek to before the beginning of the file
       r->_errno = EINVAL;
+      free(fsCmd);
       return -1;
    }
 
    // Update the current offset
    file->offset = offset + pos;
    FSStatus result = FSSetPosFile(fsClient, fsCmd, file->fd, file->offset, -1);
+   free(fsCmd);
 
    if (result < 0) {
       return result;
@@ -554,7 +588,12 @@ fs_fstat(struct _reent *r,
    FSStat fsstat;
    fs_file_t *file = (fs_file_t*)fd;
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    rc = FSGetStatFile(fsClient, fsCmd, file->fd, &fsstat, -1);
+   free(fsCmd);
 
    if (rc >= 0) {
       memset(st, 0, sizeof(struct stat));
@@ -582,6 +621,10 @@ fs_stat(struct _reent *r,
       return -1;
    }
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    // First try open as file
    rc = FSOpenFile(fsClient, fsCmd, file, "r", (FSFileHandle*)&fd, -1);
 
@@ -589,6 +632,7 @@ fs_stat(struct _reent *r,
       fs_file_t tmpfd = { .fd = fd };
       rc = fs_fstat(r, (int)&tmpfd, st);
       FSCloseFile(fsClient, fsCmd, fd, -1);
+      free(fsCmd);
       return rc;
    }
 
@@ -600,9 +644,12 @@ fs_stat(struct _reent *r,
       st->st_nlink = 1;
       st->st_mode = S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO;
       FSCloseDir(fsClient, fsCmd, fd, -1);
+      free(fsCmd);
       return 0;
    }
 
+   free(fsCmd);
+
    r->_errno = fs_translate_error(rc);
    return -1;
 }
@@ -633,8 +680,13 @@ fs_unlink(struct _reent *r,
       return -1;
    }
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    rc = FSRemove(fsClient, fsCmd, path_fix, -1);
    free(path_fix);
+   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -661,8 +713,13 @@ fs_chdir(struct _reent *r,
       return -1;
    }
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    rc = FSChangeDir(fsClient, fsCmd, path, -1);
    free(path);
+   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -701,9 +758,14 @@ fs_rename(struct _reent *r,
       return -1;
    }
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    rc = FSRename(fsClient, fsCmd, path_old, path_new, -1);
    free(path_old);
    free(path_new);
+   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -731,9 +793,14 @@ fs_mkdir(struct _reent *r,
       return -1;
    }
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    // TODO: Use mode to set directory attributes.
    rc = FSMakeDir(fsClient, fsCmd, path_fix, -1);
    free(path_fix);
+   free(fsCmd);
 
    if (rc == FS_ERROR_ALREADY_EXISTS) {
       r->_errno = EEXIST;
@@ -765,8 +832,13 @@ fs_diropen(struct _reent *r,
       return NULL;
    }
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    fs_dir_t *dir = (fs_dir_t*)(dirState->dirStruct);
    rc = FSOpenDir(fsClient, fsCmd, path_fixed, &fd, -1);
+   free(fsCmd);
 
    if (rc >= 0) {
       dir->magic = FS_DIRITER_MAGIC;
@@ -786,8 +858,14 @@ fs_dirreset(struct _reent *r,
             DIR_ITER *dirState)
 {
    FSStatus rc;
+
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    fs_dir_t *dir = (fs_dir_t*)(dirState->dirStruct);
    rc = FSRewindDir(fsClient, fsCmd, dir->fd, -1);
+   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -806,9 +884,14 @@ fs_dirnext(struct _reent *r,
    FSStatus rc;
    fs_dir_t *dir = (fs_dir_t*)(dirState->dirStruct);
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    // Fetch the next dir
    memset(&dir->entry_data, 0, sizeof(dir->entry_data));
    rc = FSReadDir(fsClient, fsCmd, dir->fd, &dir->entry_data, -1);
+   free(fsCmd);
 
    if (rc < 0) {
       // There are no more entries; ENOENT signals end-of-directory
@@ -846,8 +929,14 @@ fs_dirclose(struct _reent *r,
             DIR_ITER *dirState)
 {
    FSStatus rc;
+
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    fs_dir_t *dir = (fs_dir_t*)(dirState->dirStruct);
    rc = FSCloseDir(fsClient, fsCmd, dir->fd, -1);
+   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -892,14 +981,20 @@ fs_ftruncate(struct _reent *r,
       return -1;
    }
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    // Set the new file size
    rc = FSSetPosFile(fsClient, fsCmd, file->fd, len, -1);
 
    if (rc >= 0) {
+      free(fsCmd);
       return 0;
    }
 
    rc = FSTruncateFile(fsClient, fsCmd, file->fd, -1);
+   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -916,7 +1011,12 @@ fs_fsync(struct _reent *r,
    FSStatus rc;
    fs_file_t *file = (fs_file_t*)fd;
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    rc = FSFlushFile(fsClient, fsCmd, file->fd, -1);
+   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -939,8 +1039,13 @@ fs_chmod(struct _reent *r,
       return -1;
    }
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    rc = FSChangeMode(fsClient, fsCmd, path_fix, (FSMode)mode, -1);
    free(path_fix);
+   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -978,8 +1083,13 @@ fs_rmdir(struct _reent *r,
       return -1;
    }
 
+   // Set up command block
+   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSInitCmdBlock(fsCmd);
+
    rc = FSRemove(fsClient, fsCmd, path_fix, -1);
    free(path_fix);
+   free(fsCmd);
 
    if (rc >= 0) {
       return 0;

From 163aa5125105b425daca83e1b8862504a602ca07 Mon Sep 17 00:00:00 2001
From: shinyquagsire23 <mtinc2@gmail.com>
Date: Sat, 8 Oct 2016 11:57:52 -0600
Subject: [PATCH 2/2] Allocate FSCmdBlock to stack

---
 crt/fs_dev.c | 176 +++++++++++++++++++++------------------------------
 1 file changed, 71 insertions(+), 105 deletions(-)

diff --git a/crt/fs_dev.c b/crt/fs_dev.c
index 84bde47..dab72a2 100644
--- a/crt/fs_dev.c
+++ b/crt/fs_dev.c
@@ -122,7 +122,7 @@ fsDevInit()
    }
 
    fsClient = memalign(0x20, sizeof(FSClient));
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
+   FSCmdBlock fsCmd;
    FSMountSource mountSource;
    char mountPath[0x80];
    char workDir[0x83];
@@ -132,11 +132,10 @@ fsDevInit()
 
    if (rc < 0) {
       free(fsClient);
-      free(fsCmd);
       return rc;
    }
 
-   FSInitCmdBlock(fsCmd);
+   FSInitCmdBlock(&fsCmd);
 
    if (rc >= 0) {
       int dev = AddDevice(&fs_devoptab);
@@ -146,13 +145,13 @@ fsDevInit()
          fsInitialised = true;
 
          // Mount the SD card
-         rc = FSGetMountSource(fsClient, fsCmd, FS_MOUNT_SOURCE_SD, &mountSource, -1);
+         rc = FSGetMountSource(fsClient, &fsCmd, FS_MOUNT_SOURCE_SD, &mountSource, -1);
 
          if (rc < 0) {
             return rc;
          }
 
-         rc = FSMount(fsClient, fsCmd, &mountSource, mountPath, 0x80, -1);
+         rc = FSMount(fsClient, &fsCmd, &mountSource, mountPath, 0x80, -1);
 
          if (rc >= 0) {
             // chdir to SD root for general use
@@ -163,13 +162,10 @@ fsDevInit()
       } else {
          FSDelClient(fsClient, -1);
          free(fsClient);
-         free(fsCmd);
          return dev;
       }
    }
 
-   free(fsCmd);
-
    return rc;
 }
 
@@ -275,22 +271,20 @@ fs_open(struct _reent *r,
    */
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
    // Open the file
-   rc = FSOpenFile(fsClient, fsCmd, path_fixed, fs_mode, &fd, -1);
+   rc = FSOpenFile(fsClient, &fsCmd, path_fixed, fs_mode, &fd, -1);
 
    if (rc >= 0) {
       file->fd = fd;
       file->flags = (flags & (O_ACCMODE|O_APPEND|O_SYNC));
-      FSGetPosFile(fsClient, fsCmd, fd, &file->offset, -1);
+      FSGetPosFile(fsClient, &fsCmd, fd, &file->offset, -1);
       free(path_fixed);
-      free(fsCmd);
       return 0;
    }
 
-   free(fsCmd);
    free(path_fixed);
    r->_errno = fs_translate_error(rc);
    return -1;
@@ -304,11 +298,10 @@ fs_close(struct _reent *r,
    fs_file_t *file = (fs_file_t*)fd;
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
-   rc = FSCloseFile(fsClient, fsCmd, file->fd, -1);
-   free(fsCmd);
+   rc = FSCloseFile(fsClient, &fsCmd, file->fd, -1);
 
    if (rc >= 0) {
       return 0;
@@ -348,12 +341,11 @@ fs_write(struct _reent *r,
       memcpy(tmp_buffer, ptr, toWrite);
 
       // Set up command block
-      FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-      FSInitCmdBlock(fsCmd);
+      FSCmdBlock fsCmd;
+      FSInitCmdBlock(&fsCmd);
 
       // Write the data
-      rc = FSWriteFile(fsClient, fsCmd, tmp_buffer, 1, toWrite, file->fd, 0, -1);
-      free(fsCmd);
+      rc = FSWriteFile(fsClient, &fsCmd, tmp_buffer, 1, toWrite, file->fd, 0, -1);
 
       if(rc < 0) {
          free(tmp_buffer);
@@ -409,12 +401,11 @@ fs_write_safe(struct _reent *r,
       memcpy(tmp_buffer, ptr, toWrite);
 
       // Set up command block
-      FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-      FSInitCmdBlock(fsCmd);
+      FSCmdBlock fsCmd;
+      FSInitCmdBlock(&fsCmd);
 
       // Write the data
-      rc = FSWriteFile(fsClient, fsCmd, tmp_buffer, 1, toWrite, file->fd, 0, -1);
-      free(fsCmd);
+      rc = FSWriteFile(fsClient, &fsCmd, tmp_buffer, 1, toWrite, file->fd, 0, -1);
 
       if (rc < 0) {
          free(tmp_buffer);
@@ -457,15 +448,14 @@ fs_read(struct _reent *r,
    }
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
    FSStat fsstat;
-   rc = FSGetStatFile(fsClient, fsCmd, file->fd, &fsstat, -1);
+   rc = FSGetStatFile(fsClient, &fsCmd, file->fd, &fsstat, -1);
 
    if(rc < 0) {
       r->_errno = fs_translate_error(rc);
-      free(fsCmd);
       return -1;
    }
 
@@ -480,12 +470,11 @@ fs_read(struct _reent *r,
       }
 
       // Write the data
-      rc = FSReadFile(fsClient, fsCmd, tmp_buffer, 1, toRead, file->fd, 0, -1);
+      rc = FSReadFile(fsClient, &fsCmd, tmp_buffer, 1, toRead, file->fd, 0, -1);
 
       if(rc <= 0)
       {
          free(tmp_buffer);
-         free(fsCmd);
 
          // Return partial transfer
          if (bytesRead > 0) {
@@ -507,7 +496,6 @@ fs_read(struct _reent *r,
       len          -= bytes;
    }
 
-   free(fsCmd);
    free(tmp_buffer);
    return bytesRead;
 }
@@ -523,15 +511,14 @@ fs_seek(struct _reent *r,
    fs_file_t *file = (fs_file_t*)fd;
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
    FSStat fsstat;
-   rc = FSGetStatFile(fsClient, fsCmd, file->fd, &fsstat, -1);
+   rc = FSGetStatFile(fsClient, &fsCmd, file->fd, &fsstat, -1);
 
    if (rc < 0) {
       r->_errno = fs_translate_error(rc);
-      free(fsCmd);
       return -1;
    }
 
@@ -555,7 +542,6 @@ fs_seek(struct _reent *r,
    // An invalid option was provided
    default:
       r->_errno = EINVAL;
-      free(fsCmd);
       return -1;
    }
 
@@ -563,14 +549,12 @@ fs_seek(struct _reent *r,
    if(pos < 0 && offset < -pos) {
       // Don't allow seek to before the beginning of the file
       r->_errno = EINVAL;
-      free(fsCmd);
       return -1;
    }
 
    // Update the current offset
    file->offset = offset + pos;
-   FSStatus result = FSSetPosFile(fsClient, fsCmd, file->fd, file->offset, -1);
-   free(fsCmd);
+   FSStatus result = FSSetPosFile(fsClient, &fsCmd, file->fd, file->offset, -1);
 
    if (result < 0) {
       return result;
@@ -589,11 +573,10 @@ fs_fstat(struct _reent *r,
    fs_file_t *file = (fs_file_t*)fd;
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
-   rc = FSGetStatFile(fsClient, fsCmd, file->fd, &fsstat, -1);
-   free(fsCmd);
+   rc = FSGetStatFile(fsClient, &fsCmd, file->fd, &fsstat, -1);
 
    if (rc >= 0) {
       memset(st, 0, sizeof(struct stat));
@@ -622,34 +605,30 @@ fs_stat(struct _reent *r,
    }
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
    // First try open as file
-   rc = FSOpenFile(fsClient, fsCmd, file, "r", (FSFileHandle*)&fd, -1);
+   rc = FSOpenFile(fsClient, &fsCmd, file, "r", (FSFileHandle*)&fd, -1);
 
    if (rc >= 0) {
       fs_file_t tmpfd = { .fd = fd };
       rc = fs_fstat(r, (int)&tmpfd, st);
-      FSCloseFile(fsClient, fsCmd, fd, -1);
-      free(fsCmd);
+      FSCloseFile(fsClient, &fsCmd, fd, -1);
       return rc;
    }
 
    // File failed, so lets try open as directory
-   rc = FSOpenDir(fsClient, fsCmd, file, (FSDirectoryHandle*)&fd, -1);
+   rc = FSOpenDir(fsClient, &fsCmd, file, (FSDirectoryHandle*)&fd, -1);
 
    if (rc >= 0) {
       memset(st, 0, sizeof(struct stat));
       st->st_nlink = 1;
       st->st_mode = S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO;
-      FSCloseDir(fsClient, fsCmd, fd, -1);
-      free(fsCmd);
+      FSCloseDir(fsClient, &fsCmd, fd, -1);
       return 0;
    }
 
-   free(fsCmd);
-
    r->_errno = fs_translate_error(rc);
    return -1;
 }
@@ -681,12 +660,11 @@ fs_unlink(struct _reent *r,
    }
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
-   rc = FSRemove(fsClient, fsCmd, path_fix, -1);
+   rc = FSRemove(fsClient, &fsCmd, path_fix, -1);
    free(path_fix);
-   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -714,12 +692,11 @@ fs_chdir(struct _reent *r,
    }
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
-   rc = FSChangeDir(fsClient, fsCmd, path, -1);
+   rc = FSChangeDir(fsClient, &fsCmd, path, -1);
    free(path);
-   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -759,13 +736,12 @@ fs_rename(struct _reent *r,
    }
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
-   rc = FSRename(fsClient, fsCmd, path_old, path_new, -1);
+   rc = FSRename(fsClient, &fsCmd, path_old, path_new, -1);
    free(path_old);
    free(path_new);
-   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -794,13 +770,12 @@ fs_mkdir(struct _reent *r,
    }
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
    // TODO: Use mode to set directory attributes.
-   rc = FSMakeDir(fsClient, fsCmd, path_fix, -1);
+   rc = FSMakeDir(fsClient, &fsCmd, path_fix, -1);
    free(path_fix);
-   free(fsCmd);
 
    if (rc == FS_ERROR_ALREADY_EXISTS) {
       r->_errno = EEXIST;
@@ -833,12 +808,11 @@ fs_diropen(struct _reent *r,
    }
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
    fs_dir_t *dir = (fs_dir_t*)(dirState->dirStruct);
-   rc = FSOpenDir(fsClient, fsCmd, path_fixed, &fd, -1);
-   free(fsCmd);
+   rc = FSOpenDir(fsClient, &fsCmd, path_fixed, &fd, -1);
 
    if (rc >= 0) {
       dir->magic = FS_DIRITER_MAGIC;
@@ -860,12 +834,11 @@ fs_dirreset(struct _reent *r,
    FSStatus rc;
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
    fs_dir_t *dir = (fs_dir_t*)(dirState->dirStruct);
-   rc = FSRewindDir(fsClient, fsCmd, dir->fd, -1);
-   free(fsCmd);
+   rc = FSRewindDir(fsClient, &fsCmd, dir->fd, -1);
 
    if (rc >= 0) {
       return 0;
@@ -885,13 +858,12 @@ fs_dirnext(struct _reent *r,
    fs_dir_t *dir = (fs_dir_t*)(dirState->dirStruct);
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
    // Fetch the next dir
    memset(&dir->entry_data, 0, sizeof(dir->entry_data));
-   rc = FSReadDir(fsClient, fsCmd, dir->fd, &dir->entry_data, -1);
-   free(fsCmd);
+   rc = FSReadDir(fsClient, &fsCmd, dir->fd, &dir->entry_data, -1);
 
    if (rc < 0) {
       // There are no more entries; ENOENT signals end-of-directory
@@ -931,12 +903,11 @@ fs_dirclose(struct _reent *r,
    FSStatus rc;
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
    fs_dir_t *dir = (fs_dir_t*)(dirState->dirStruct);
-   rc = FSCloseDir(fsClient, fsCmd, dir->fd, -1);
-   free(fsCmd);
+   rc = FSCloseDir(fsClient, &fsCmd, dir->fd, -1);
 
    if (rc >= 0) {
       return 0;
@@ -982,19 +953,17 @@ fs_ftruncate(struct _reent *r,
    }
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
    // Set the new file size
-   rc = FSSetPosFile(fsClient, fsCmd, file->fd, len, -1);
+   rc = FSSetPosFile(fsClient, &fsCmd, file->fd, len, -1);
 
    if (rc >= 0) {
-      free(fsCmd);
       return 0;
    }
 
-   rc = FSTruncateFile(fsClient, fsCmd, file->fd, -1);
-   free(fsCmd);
+   rc = FSTruncateFile(fsClient, &fsCmd, file->fd, -1);
 
    if (rc >= 0) {
       return 0;
@@ -1012,11 +981,10 @@ fs_fsync(struct _reent *r,
    fs_file_t *file = (fs_file_t*)fd;
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
-   rc = FSFlushFile(fsClient, fsCmd, file->fd, -1);
-   free(fsCmd);
+   rc = FSFlushFile(fsClient, &fsCmd, file->fd, -1);
 
    if (rc >= 0) {
       return 0;
@@ -1040,12 +1008,11 @@ fs_chmod(struct _reent *r,
    }
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
-   rc = FSChangeMode(fsClient, fsCmd, path_fix, (FSMode)mode, -1);
+   rc = FSChangeMode(fsClient, &fsCmd, path_fix, (FSMode)mode, -1);
    free(path_fix);
-   free(fsCmd);
 
    if (rc >= 0) {
       return 0;
@@ -1084,12 +1051,11 @@ fs_rmdir(struct _reent *r,
    }
 
    // Set up command block
-   FSCmdBlock* fsCmd = memalign(0x20, sizeof(FSCmdBlock));
-   FSInitCmdBlock(fsCmd);
+   FSCmdBlock fsCmd;
+   FSInitCmdBlock(&fsCmd);
 
-   rc = FSRemove(fsClient, fsCmd, path_fix, -1);
+   rc = FSRemove(fsClient, &fsCmd, path_fix, -1);
    free(path_fix);
-   free(fsCmd);
 
    if (rc >= 0) {
       return 0;