[PATCH v3 3/6] fs: fat: Refactor delete_dentry_long interface

[Heinrich Schuchardt]

On 2/7/25 13:45, Daniel Venzin wrote:
> Directory entries cannot be deleted without also removing their
> corresponding FAT entries. This refactor allows for individual
> selection of deleting the directory entry and the FAT entry,
> facilitating better reuse of existing functionality.
>
> Signed-off-by: Daniel Venzin <Daniel.Venzin at mt.com>
>
> ---
>
> (no changes since v2)
>
> Changes in v2:
> - Refactor delete_dentry_long for improved reusability
>
>   fs/fat/fat_write.c | 24 ++++++++++++++++--------
>   1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
> index ea877ee9171..c78b80e0b7a 100644
> --- a/fs/fat/fat_write.c
> +++ b/fs/fat/fat_write.c
> @@ -31,6 +31,10 @@ static const char LONG_ONLY_CHARS[] = "+,;=[]";
>   /* Combined size of the name and ext fields in the directory entry */
>   #define SHORT_NAME_SIZE 11
>
> +/* Flags to control the behavior of the delete_dentry_long(..) */
> +#define FATENT_CLEAR_SKIP	0
> +#define FATENT_CLEAR	1
> +
>   /**
>    * str2fat() - convert string to valid FAT name characters
>    *
> @@ -1568,19 +1572,23 @@ static int delete_long_name(fat_itr *itr)
>    * delete_dentry_long() - remove directory entry
>    *
>    * @itr:	directory iterator
> + * @fatent:	flag indicating whether to delete the FAT entry
>    * Return:	0 for success
>    */
> -static int delete_dentry_long(fat_itr *itr)
> +static int delete_dentry_long(fat_itr *itr, int fatent)
>   {
> -	fsdata *mydata = itr->fsdata;
>   	dir_entry *dent = itr->dent;
>
> -	/* free cluster blocks */
> -	clear_fatent(mydata, START(dent));
> -	if (flush_dirty_fat_buffer(mydata) < 0) {
> -		printf("Error: flush fat buffer\n");
> -		return -EIO;
> +	if (fatent) {

Why do we define a constant, if we don't compare with FATENT_CLEAR here?

> +		fsdata *mydata = itr->fsdata;
> +		/* free cluster blocks */
> +		clear_fatent(mydata, START(dent));
> +		if (flush_dirty_fat_buffer(mydata) < 0) {
> +			printf("Error: flush fat buffer\n");

Please, do not print in file system functions. This may mess up EFI
application screen output.

log_debug() is fine.

Best regards

Heinrich

> +			return -EIO;
> +		}
>   	}
> +
>   	/* Position to first directory entry for long name */
>   	if (itr->clust != itr->dent_clust) {
>   		int ret;
> @@ -1661,7 +1669,7 @@ int fat_unlink(const char *filename)
>   		}
>   	}
>
> -	ret = delete_dentry_long(itr);
> +	ret = delete_dentry_long(itr, FATENT_CLEAR);
>
>   exit:
>   	free(fsdata.fatbuf);