fatfs: get correct cluster size for root directory

Author: totalspectrum

include/filesys/fatfs/fatfs.cc

@@ -223,8 +223,9 @@ int v_stat(const char *name, struct stat *buf)
 {
     int r;
     FILINFO finfo;
+    VOLINFO vinfo;
     unsigned mode;
-    unsigned clustersize = 4096;
+    unsigned clustersize = 32768; /* default */
 #ifdef _DEBUG_FATFS
     __builtin_printf("v_stat(%s)\n", name);
 #endif
@@ -235,11 +236,16 @@ int v_stat(const char *name, struct stat *buf)
         r = 0;
     } else {
         r = f_stat(name, &finfo);
-        clustersize = finfo.fclust;
     }
     if (r != 0) {
         return _set_dos_error(r);
     }
+    if (f_getvolinfo(name, &vinfo) == FR_OK) {
+#ifdef _DEBUG_FATFS
+        __builtin_printf("f_getvolinfo: ssize=%u csize=%u\n", vinfo.ssize, vinfo.csize);
+#endif        
+        clustersize = vinfo.csize * vinfo.ssize;
+    }
     mode = S_IRUSR | S_IRGRP | S_IROTH;
     if (!(finfo.fattrib & AM_RDO)) {
         mode |= S_IWUSR | S_IWGRP | S_IWOTH;

include/filesys/fatfs/ff.c

@@ -4722,6 +4722,26 @@ FRESULT f_findfirst (
 
 #endif	/* FF_USE_FIND */
 
+#if FF_FS_MINIMIZE == 0
+FRESULT f_getvolinfo (
+    const TCHAR* path,
+    VOLINFO *info
+    )
+{
+	FRESULT res;
+	DIR dj;
+	DEF_NAMBUF
+
+	/* Get logical drive */
+	res = mount_volume(&path, &dj.obj.fs, 0);
+        if (res == FR_OK) {
+            info->csize = dj.obj.fs->csize;
+            info->ssize = SS(dj.obj.fs);
+        }
+        LEAVE_FF(dj.obj.fs, res);
+            
+}
+#endif
 
 
 #if FF_FS_MINIMIZE == 0
@@ -4754,7 +4774,6 @@ FRESULT f_stat (
 		FREE_NAMBUF();
 	}
 
-        if (fno) fno->fclust = (DWORD)dj.obj.fs->csize * SS(dj.obj.fs);
 	LEAVE_FF(dj.obj.fs, res);
 }
 
@@ -5379,8 +5398,6 @@ FRESULT f_getlabel (
 	LEAVE_FF(fs, res);
 }
 
-
-
 #if !FF_FS_READONLY
 /*-----------------------------------------------------------------------*/
 /* Set Volume Label                                                      */

include/filesys/fatfs/ff.h

@@ -249,7 +249,6 @@ typedef struct {
 	WORD	fdate;			/* Modified date */
 	WORD	ftime;			/* Modified time */
 	BYTE	fattrib;		/* File attribute */
-	DWORD	fclust;			/* File cluster size in bytes */
 #if FF_USE_LFN
 	TCHAR	altname[FF_SFN_BUF + 1];/* Altenative file name */
 	TCHAR	fname[FF_LFN_BUF + 1];	/* Primary file name */
@@ -259,6 +258,12 @@ typedef struct {
 } FILINFO;
 
 
+/* Volume information structure (VOLINFO) */
+
+typedef struct {
+	DWORD	ssize;			/* Sector size in bytes */
+	DWORD	csize;			/* Cluster size in sectors */
+} VOLINFO;
 
 /* Format parameter structure (MKFS_PARM) */
 
@@ -326,6 +331,7 @@ FRESULT f_getcwd (TCHAR* buff, UINT len);							/* Get current directory */
 FRESULT f_getfree (const TCHAR* path, DWORD* nclst, FATFS** fatfs);	/* Get number of free clusters on the drive */
 FRESULT f_getlabel (const TCHAR* path, TCHAR* label, DWORD* vsn);	/* Get volume label */
 FRESULT f_setlabel (const TCHAR* label);							/* Set volume label */
+FRESULT f_getvolinfo (const TCHAR* path, VOLINFO *info);  /* Get information about the volume */
 FRESULT f_forward (FIL* fp, UINT(*func)(const BYTE*,UINT), UINT btf, UINT* bf);	/* Forward data to the stream */
 FRESULT f_expand (FIL* fp, FSIZE_t fsz, BYTE opt);					/* Allocate a contiguous block to the file */
 FRESULT f_mount (FATFS* fs, const TCHAR* path, BYTE opt);			/* Mount/Unmount a logical drive */