LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs: fat: pass shortname to fill_dir_slot 

Currently we pass the short name via the directory iterator.
Pass it explicitly as a parameter.

This removes the requirement to set the short name in the iterator before
writing the long name.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2020-11-21 08:32:50 +01:00
parent 28cef9ca2e
commit a343249bef
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/fat/fat_write.c
View File

@ -278,12 +278,16 @@ name11_12:
static int new_dir_table(fat_itr *itr); static int new_dir_table(fat_itr *itr);
static int flush_dir(fat_itr *itr); static int flush_dir(fat_itr *itr);
/* /**
* Fill dir_slot entries with appropriate name, id, and attr * fill_dir_slot() - fill directory entries for long name
* 'itr' will point to a next entry *
* @itr: directory iterator
* @l_name: long name
* @shortname: short name
* Return: 0 for success, -errno otherwise
*/ */
static int static int
fill_dir_slot(fat_itr *itr, const char *l_name) fill_dir_slot(fat_itr *itr, const char *l_name, const char *shortname)
{ {
__u8 temp_dir_slot_buffer[MAX_LFN_SLOT * sizeof(dir_slot)]; __u8 temp_dir_slot_buffer[MAX_LFN_SLOT * sizeof(dir_slot)];
dir_slot *slotptr = (dir_slot *)temp_dir_slot_buffer; dir_slot *slotptr = (dir_slot *)temp_dir_slot_buffer;
@ -291,7 +295,7 @@ fill_dir_slot(fat_itr *itr, const char *l_name)
int idx = 0, ret; int idx = 0, ret;
/* Get short file name checksum value */ /* Get short file name checksum value */
checksum = mkcksum(itr->dent->name, itr->dent->ext); checksum = mkcksum(shortname, shortname + 8);
do { do {
memset(slotptr, 0x00, sizeof(dir_slot)); memset(slotptr, 0x00, sizeof(dir_slot));
@ -317,7 +321,7 @@ fill_dir_slot(fat_itr *itr, const char *l_name)
if (!fat_itr_next(itr) && !itr->dent) if (!fat_itr_next(itr) && !itr->dent)
if ((itr->is_root && itr->fsdata->fatsize != 32) || if ((itr->is_root && itr->fsdata->fatsize != 32) ||
new_dir_table(itr)) new_dir_table(itr))
return -1; return -EIO;
} }
return 0; return 0;
@ -1241,7 +1245,7 @@ int file_fat_write_at(const char *filename, loff_t pos, void *buffer,
goto exit; goto exit;
if (ret > 1) { if (ret > 1) {
/* Set long name entries */ /* Set long name entries */
ret = fill_dir_slot(itr, filename); ret = fill_dir_slot(itr, filename, itr->dent->name);
if (ret) if (ret)
goto exit; goto exit;
} }
@ -1503,7 +1507,7 @@ int fat_mkdir(const char *new_dirname)
goto exit; goto exit;
if (ret > 1) { if (ret > 1) {
/* Set long name entries */ /* Set long name entries */
ret = fill_dir_slot(itr, dirname); ret = fill_dir_slot(itr, dirname, itr->dent->name);
if (ret) if (ret)
goto exit; goto exit;
} }