RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: replace btrfs_open_dir with btrfs_open_dir_fd 

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 the last btrfs_open_dir() call with btrfs_open_dir_fd()
removing any reference to the unused/useless dirstream variables.

Also update the add_seen_fsid() function removing any reference to dir
stream (again this is never used).

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:21 +01:00 committed by David Sterba
parent 372c79e7ad
commit 43dbe63dba
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/filesystem.c
View File

@ -307,7 +307,7 @@ static void print_one_uuid(struct btrfs_fs_devices *fs_devices,
u64 devs_found = 0; u64 devs_found = 0;
u64 total; u64 total;
if (add_seen_fsid(fs_devices->fsid, seen_fsid_hash, -1, NULL)) if (add_seen_fsid(fs_devices->fsid, seen_fsid_hash, -1))
return; return;
uuid_unparse(fs_devices->fsid, uuidbuf); uuid_unparse(fs_devices->fsid, uuidbuf);
@ -352,7 +352,7 @@ static int print_one_fs(struct btrfs_ioctl_fs_info_args *fs_info,
struct btrfs_ioctl_dev_info_args *tmp_dev_info; struct btrfs_ioctl_dev_info_args *tmp_dev_info;
int ret; int ret;
ret = add_seen_fsid(fs_info->fsid, seen_fsid_hash, -1, NULL); ret = add_seen_fsid(fs_info->fsid, seen_fsid_hash, -1);
if (ret == -EEXIST) if (ret == -EEXIST)
return 0; return 0;
else if (ret) else if (ret)

8
cmds/subvolume.c
View File

@ -374,7 +374,6 @@ static int cmd_subvolume_delete(const struct cmd_struct *cmd, int argc, char **a
char *dupdname = NULL; char *dupdname = NULL;
char *dupvname = NULL; char *dupvname = NULL;
char *path = NULL; char *path = NULL;
DIR *dirstream = NULL;
int commit_mode = 0; int commit_mode = 0;
bool subvol_path_not_found = false; bool subvol_path_not_found = false;
u8 fsid[BTRFS_FSID_SIZE]; u8 fsid[BTRFS_FSID_SIZE];
@ -498,7 +497,7 @@ again:
if (subvolid > 0) if (subvolid > 0)
dname = dupvname; dname = dupvname;
fd = btrfs_open_dir(dname, &dirstream, 1); fd = btrfs_open_dir_fd(dname);
if (fd < 0) { if (fd < 0) {
ret = 1; ret = 1;
goto out; goto out;
@ -592,7 +591,7 @@ again:
goto out; goto out;
} }
if (add_seen_fsid(fsid, seen_fsid_hash, fd, dirstream) == 0) { if (add_seen_fsid(fsid, seen_fsid_hash, fd) == 0) {
uuid_unparse(fsid, uuidbuf); uuid_unparse(fsid, uuidbuf);
pr_verbose(LOG_INFO, " new fs is found for '%s', fsid: %s\n", pr_verbose(LOG_INFO, " new fs is found for '%s', fsid: %s\n",
path, uuidbuf); path, uuidbuf);
@ -606,10 +605,9 @@ again:
} }
out: out:
close_file_or_dir(fd, dirstream); close(fd);
keep_fd: keep_fd:
fd = -1; fd = -1;
dirstream = NULL;
free(dupdname); free(dupdname);
free(dupvname); free(dupvname);
dupdname = NULL; dupdname = NULL;

6
common/device-scan.c
View File

@ -313,8 +313,7 @@ int is_seen_fsid(u8 *fsid, struct seen_fsid *seen_fsid_hash[])
return 0; return 0;
} }
int add_seen_fsid(u8 *fsid, struct seen_fsid *seen_fsid_hash[], int add_seen_fsid(u8 *fsid, struct seen_fsid *seen_fsid_hash[], int fd)
int fd, DIR *dirstream)
{ {
u8 hash = fsid[0]; u8 hash = fsid[0];
int slot = hash % SEEN_FSID_HASH_SIZE; int slot = hash % SEEN_FSID_HASH_SIZE;
@ -342,7 +341,6 @@ insert:
alloc->next = NULL; alloc->next = NULL;
memcpy(alloc->fsid, fsid, BTRFS_FSID_SIZE); memcpy(alloc->fsid, fsid, BTRFS_FSID_SIZE);
alloc->fd = fd; alloc->fd = fd;
alloc->dirstream = dirstream;
if (seen) if (seen)
seen->next = alloc; seen->next = alloc;
@ -362,7 +360,7 @@ void free_seen_fsid(struct seen_fsid *seen_fsid_hash[])
seen = seen_fsid_hash[slot]; seen = seen_fsid_hash[slot];
while (seen) { while (seen) {
next = seen->next; next = seen->next;
close_file_or_dir(seen->fd, seen->dirstream); close(seen->fd);
free(seen); free(seen);
seen = next; seen = next;
} }

4
common/device-scan.h
View File

@ -43,7 +43,6 @@ struct btrfs_trans_handle;
struct seen_fsid { struct seen_fsid {
u8 fsid[BTRFS_FSID_SIZE]; u8 fsid[BTRFS_FSID_SIZE];
struct seen_fsid *next; struct seen_fsid *next;
DIR *dirstream;
int fd; int fd;
}; };
@ -58,8 +57,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
int btrfs_device_already_in_root(struct btrfs_root *root, int fd, int btrfs_device_already_in_root(struct btrfs_root *root, int fd,
int super_offset); int super_offset);
int is_seen_fsid(u8 *fsid, struct seen_fsid *seen_fsid_hash[]); int is_seen_fsid(u8 *fsid, struct seen_fsid *seen_fsid_hash[]);
int add_seen_fsid(u8 *fsid, struct seen_fsid *seen_fsid_hash[], int add_seen_fsid(u8 *fsid, struct seen_fsid *seen_fsid_hash[], int fd);
int fd, DIR *dirstream);
void free_seen_fsid(struct seen_fsid *seen_fsid_hash[]); void free_seen_fsid(struct seen_fsid *seen_fsid_hash[]);
int test_uuid_unique(const char *uuid_str); int test_uuid_unique(const char *uuid_str);