Skip to contentSkip to conversation

Revert "fs: fat: assign rootdir sector when accessing root directory"

PATCH New Tom Rini 1 participant 2 messages Jan 11, 2019 – Jan 12, 2019 VFAT/FAT/msdos filesystem

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 Revert "fs: fat: assign rootdir sector when accessing root directory"

This particular commit is causing a regression on stih410-b2260 and other platforms when reading from FAT16. Noting that I had rebased the original fix from Thomas onto then-current master, there is also question from Akashi-san if the change is still needed after other FAT fixes that have gone in.

This reverts commit a68b0e11ea774492713a65d9fd5bb525fcaefff3.

Cc AKASHI Takahiro <[email protected]>
Cc Thomas RIENOESSL <[email protected]>
---
 fs/fat/fat.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/fat/fat.c +1 -4
index ac8913e71929..179bf4f3d89d 100644
@@ -736,10 +736,7 @@ static void *next_cluster(fat_itr *itr)
 	if (itr->last_cluster)
 		return NULL;
 
-	if (itr->fsdata->fatsize != 32 && itr->is_root)
-		sect = mydata->rootdir_sect;
-	else
-		sect = clust_to_sect(itr->fsdata, itr->next_clust);
+	sect = clust_to_sect(itr->fsdata, itr->next_clust);
 
 	debug("FAT read(sect=%d), clust_size=%d, DIRENTSPERBLOCK=%zd\n",
 	      sect, itr->fsdata->clust_size, DIRENTSPERBLOCK);
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/1 Revert "fs: fat: assign rootdir sector when accessing root directory"

Quoted 6 lines · Tom Rini

This particular commit is causing a regression on stih410-b2260 and other platforms when reading from FAT16. Noting that I had rebased the original fix from Thomas onto then-current master, there is also question from Akashi-san if the change is still needed after other FAT fixes that have gone in.

Quoted 6 lines

This reverts commit a68b0e11ea774492713a65d9fd5bb525fcaefff3.

Cc AKASHI Takahiro <[email protected]>
Cc Thomas RIENOESSL <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190112/61d134b8/attachment.sig>