[PATCH 1/9] fs: move struct fstype_info definition to top of file
Heinrich Schuchardt
heinrich.schuchardt at canonical.com
Mon May 18 07:57:20 CEST 2026
Structure definitions should precede code using them.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
---
fs/fs.c | 86 ++++++++++++++++++++++++++++-----------------------------
1 file changed, 43 insertions(+), 43 deletions(-)
diff --git a/fs/fs.c b/fs/fs.c
index 8ea50a6c13c..fe62b71c83c 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -38,6 +38,49 @@ static int fs_dev_part;
static struct disk_partition fs_partition;
static int fs_type = FS_TYPE_ANY;
+struct fstype_info {
+ int fstype;
+ char *name;
+ /*
+ * Is it legal to pass NULL as .probe()'s fs_dev_desc parameter? This
+ * should be false in most cases. For "virtual" filesystems which
+ * aren't based on a U-Boot block device (e.g. sandbox), this can be
+ * set to true. This should also be true for the dummy entry at the end
+ * of fstypes[], since that is essentially a "virtual" (non-existent)
+ * filesystem.
+ */
+ bool null_dev_desc_ok;
+ int (*probe)(struct blk_desc *fs_dev_desc,
+ struct disk_partition *fs_partition);
+ int (*ls)(const char *dirname);
+ int (*exists)(const char *filename);
+ int (*size)(const char *filename, loff_t *size);
+ int (*read)(const char *filename, void *buf, loff_t offset,
+ loff_t len, loff_t *actread);
+ int (*write)(const char *filename, void *buf, loff_t offset,
+ loff_t len, loff_t *actwrite);
+ void (*close)(void);
+ int (*uuid)(char *uuid_str);
+ /*
+ * Open a directory stream. On success return 0 and directory
+ * stream pointer via 'dirsp'. On error, return -errno. See
+ * fs_opendir().
+ */
+ int (*opendir)(const char *filename, struct fs_dir_stream **dirsp);
+ /*
+ * Read next entry from directory stream. On success return 0
+ * and directory entry pointer via 'dentp'. On error return
+ * -errno. See fs_readdir().
+ */
+ int (*readdir)(struct fs_dir_stream *dirs, struct fs_dirent **dentp);
+ /* see fs_closedir() */
+ void (*closedir)(struct fs_dir_stream *dirs);
+ int (*unlink)(const char *filename);
+ int (*mkdir)(const char *dirname);
+ int (*ln)(const char *filename, const char *target);
+ int (*rename)(const char *old_path, const char *new_path);
+};
+
void fs_set_type(int type)
{
fs_type = type;
@@ -147,49 +190,6 @@ static inline int fs_rename_unsupported(const char *old_path,
return -1;
}
-struct fstype_info {
- int fstype;
- char *name;
- /*
- * Is it legal to pass NULL as .probe()'s fs_dev_desc parameter? This
- * should be false in most cases. For "virtual" filesystems which
- * aren't based on a U-Boot block device (e.g. sandbox), this can be
- * set to true. This should also be true for the dummy entry at the end
- * of fstypes[], since that is essentially a "virtual" (non-existent)
- * filesystem.
- */
- bool null_dev_desc_ok;
- int (*probe)(struct blk_desc *fs_dev_desc,
- struct disk_partition *fs_partition);
- int (*ls)(const char *dirname);
- int (*exists)(const char *filename);
- int (*size)(const char *filename, loff_t *size);
- int (*read)(const char *filename, void *buf, loff_t offset,
- loff_t len, loff_t *actread);
- int (*write)(const char *filename, void *buf, loff_t offset,
- loff_t len, loff_t *actwrite);
- void (*close)(void);
- int (*uuid)(char *uuid_str);
- /*
- * Open a directory stream. On success return 0 and directory
- * stream pointer via 'dirsp'. On error, return -errno. See
- * fs_opendir().
- */
- int (*opendir)(const char *filename, struct fs_dir_stream **dirsp);
- /*
- * Read next entry from directory stream. On success return 0
- * and directory entry pointer via 'dentp'. On error return
- * -errno. See fs_readdir().
- */
- int (*readdir)(struct fs_dir_stream *dirs, struct fs_dirent **dentp);
- /* see fs_closedir() */
- void (*closedir)(struct fs_dir_stream *dirs);
- int (*unlink)(const char *filename);
- int (*mkdir)(const char *dirname);
- int (*ln)(const char *filename, const char *target);
- int (*rename)(const char *old_path, const char *new_path);
-};
-
static struct fstype_info fstypes[] = {
#if CONFIG_IS_ENABLED(FS_FAT)
{
--
2.53.0
More information about the U-Boot
mailing list