diff mbox series

[u-boot,v2] fs: btrfs: hide duplicate 'Cannot lookup file' error on 'load'

Message ID 20241115021549.671932-1-asmadeus@codewreck.org (mailing list archive)
State New
Headers show
Series [u-boot,v2] fs: btrfs: hide duplicate 'Cannot lookup file' error on 'load' | expand

Commit Message

Dominique Martinet Nov. 15, 2024, 2:15 a.m. UTC 
From: Dominique Martinet <dominique.martinet@atmark-techno.com>

Running commands such as 'load mmc 2:1 $addr $path' when path does not
exists will print an error twice if the file does not exist, e.g.:
```
Cannot lookup file boot/boot.scr
Failed to load 'boot/boot.scr'
```
(where the first line is printed by btrfs and the second by common fs
code)

Historically other filesystems such as ext4 or fat have not been
printing a message here, so do the same here to avoid duplicate.

The other error messages in this function are also somewhat redundant,
but bring useful diagnostics if they happen somewhere, so have been left
as printf.

Note that if a user wants no message to be printed for optional file
loads, they have to check for file existence first with other commands
such as 'size'.

Signed-off-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
---
v1: https://lkml.kernel.org/r/20241106012918.1395878-1-dominique.martinet@atmark-techno.com
v1->v2: reword commit message to account for the "new" fs/fs error
messages existing

 fs/btrfs/btrfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Rini Nov. 15, 2024, 9:39 p.m. UTC | #1 
On Fri, 15 Nov 2024 11:15:47 +0900, Dominique Martinet wrote:

> Running commands such as 'load mmc 2:1 $addr $path' when path does not
> exists will print an error twice if the file does not exist, e.g.:
> ```
> Cannot lookup file boot/boot.scr
> Failed to load 'boot/boot.scr'
> ```
> (where the first line is printed by btrfs and the second by common fs
> code)
> 
> [...]

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index 350cff0cbca0..f3087f690fa4 100644
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -193,7 +193,7 @@  int btrfs_size(const char *file, loff_t *size)
 	ret = btrfs_lookup_path(fs_info->fs_root, BTRFS_FIRST_FREE_OBJECTID,
 				file, &root, &ino, &type, 40);
 	if (ret < 0) {
-		printf("Cannot lookup file %s\n", file);
+		debug("Cannot lookup file %s\n", file);
 		return ret;
 	}
 	if (type != BTRFS_FT_REG_FILE) {