diff options
| author | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2018-09-11 09:58:58 +0300 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2018-09-23 22:55:29 +0300 |
| commit | f23101f9513064efa716a132b114b2c2748b7823 (patch) | |
| tree | 1e697caeeec9755a86e1894c3cb4f5cf3a49e536 | |
| parent | 14d103bb272ef6aa31cd89f3ec9620ff4bd7ed42 (diff) | |
| download | u-boot-f23101f9513064efa716a132b114b2c2748b7823.tar.xz | |
fs: fat: extend get_fs_info() for write use
get_fs_info() was introduced in major re-work of read operation by Rob.
We want to reuse this function in write operation by extending it with
additional members in fsdata structure.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | fs/fat/fat.c | 7 | ||||
| -rw-r--r-- | include/fat.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 4b722fc5ca..5f921e81e3 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -558,10 +558,17 @@ static int get_fs_info(fsdata *mydata) if (mydata->fatsize == 32) { mydata->fatlength = bs.fat32_length; + mydata->total_sect = bs.total_sect; } else { mydata->fatlength = bs.fat_length; + mydata->total_sect = (bs.sectors[1] << 8) + bs.sectors[0]; + if (!mydata->total_sect) + mydata->total_sect = bs.total_sect; } + if (!mydata->total_sect) /* unlikely */ + mydata->total_sect = (u32)cur_part_info.size; + mydata->fats = bs.fats; mydata->fat_sect = bs.reserved; mydata->rootdir_sect = mydata->fat_sect + mydata->fatlength * bs.fats; diff --git a/include/fat.h b/include/fat.h index 09e1423685..a236451add 100644 --- a/include/fat.h +++ b/include/fat.h @@ -173,6 +173,8 @@ typedef struct { int fatbufnum; /* Used by get_fatent, init to -1 */ int rootdir_size; /* Size of root dir for non-FAT32 */ __u32 root_cluster; /* First cluster of root dir for FAT32 */ + u32 total_sect; /* Number of sectors */ + int fats; /* Number of FATs */ } fsdata; static inline u32 clust_to_sect(fsdata *fsdata, u32 clust) |