[fix][dfsv1][elm]解决块设备扇区大小校验失败时存在的disk泄漏问题

Unbear-Hz · Rbb666 · commit a828a3116dfe · 2026-06-22T16:41:29.000+08:00
diff --git a/components/dfs/dfs_v1/filesystems/elmfat/dfs_elm.c b/components/dfs/dfs_v1/filesystems/elmfat/dfs_elm.c
@@ -117,8 +117,6 @@ int dfs_elm_mount(struct dfs_filesystem *fs, unsigned long rwflag, const void *d
         return -ENOENT;
     logic_nbr[0] = '0' + index;
 
-    /* save device */
-    disk[index] = fs->dev_id;
     /* check sector size */
     if (rt_device_control(fs->dev_id, RT_DEVICE_CTRL_BLK_GETGEOME, &geometry) == RT_EOK)
     {
@@ -128,6 +126,8 @@ int dfs_elm_mount(struct dfs_filesystem *fs, unsigned long rwflag, const void *d
             return -EINVAL;
         }
     }
+    /* save device */
+    disk[index] = fs->dev_id;
 
     fat = (FATFS *)rt_malloc(sizeof(FATFS));
     if (fat == RT_NULL)

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,6 @@ int dfs_elm_mount(struct dfs_filesystem fs, unsigned long rwflag, const void d`
`117`	`117`	`return -ENOENT;`
`118`	`118`	`logic_nbr[0] = '0' + index;`
`119`	`119`
`120`		`- /* save device */`
`121`		`- disk[index] = fs->dev_id;`
`122`	`120`	`/* check sector size */`
`123`	`121`	`if (rt_device_control(fs->dev_id, RT_DEVICE_CTRL_BLK_GETGEOME, &geometry) == RT_EOK)`
`124`	`122`	`{`
`@@ -128,6 +126,8 @@ int dfs_elm_mount(struct dfs_filesystem fs, unsigned long rwflag, const void d`
`128`	`126`	`return -EINVAL;`
`129`	`127`	`}`
`130`	`128`	`}`
	`129`	`+ /* save device */`
	`130`	`+ disk[index] = fs->dev_id;`
`131`	`131`
`132`	`132`	`fat = (FATFS *)rt_malloc(sizeof(FATFS));`
`133`	`133`	`if (fat == RT_NULL)`