RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-01-13 09:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: replace btrfs_open_file_or_dir with btrfs_open_file_or_dir_fd

Browse Source 
For historical reasons the helpers [btrfs_]open_dir... return also
the 'DIR *dirstream' value when a directory is opened.

However this is never used. So avoid calling diropen() and return
only the fd.

Replace btrfs_open_file_or_dir() with btrfs_open_file_or_dir_fd()
removing any references to the unused/useless dirstream variables.

Signed-off-by: Goffredo Baroncelli <kreijack@libero.it>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Goffredo Baroncelli 2024-02-08 21:19:24 +01:00 committed by David Sterba
parent 50770da81e
commit cafef41840
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/inspect.c
View File

@ -369,14 +369,13 @@ static int cmd_inspect_rootid(const struct cmd_struct *cmd,
int ret;
int fd = -1;
u64 rootid;
DIR *dirstream = NULL;
clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 1))
return 1;
fd = btrfs_open_file_or_dir(argv[optind], &dirstream, 1);
fd = btrfs_open_file_or_dir_fd(argv[optind]);
if (fd < 0) {
ret = -ENOENT;
goto out;
@ -391,7 +390,7 @@ static int cmd_inspect_rootid(const struct cmd_struct *cmd,
pr_verbose(LOG_DEFAULT, "%llu\n", rootid);
out:
close_file_or_dir(fd, dirstream);
close(fd);
return !!ret;
}