marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: close fd on cmd_subvol_get_default return 

Without this we leak the fd when we return from the
function.

Also, remove the senseless random return values.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
master
Eric Sandeen 2013-02-25 16:54:46 -06:00 committed by David Sterba
parent 1b12f5c9f7
commit e54ba43cde
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmds-subvolume.c
View File

@ -624,7 +624,7 @@ static const char * const cmd_subvol_get_default_usage[] = {
static int cmd_subvol_get_default(int argc, char **argv) static int cmd_subvol_get_default(int argc, char **argv)
{ {
int fd; int fd = -1;
int ret; int ret;
char *subvol; char *subvol;
struct btrfs_list_filter_set *filter_set; struct btrfs_list_filter_set *filter_set;
@ -638,35 +638,36 @@ static int cmd_subvol_get_default(int argc, char **argv)
ret = test_issubvolume(subvol); ret = test_issubvolume(subvol);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "ERROR: error accessing '%s'\n", subvol); fprintf(stderr, "ERROR: error accessing '%s'\n", subvol);
return 12; return 1;
} }
if (!ret) { if (!ret) {
fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol); fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
return 13; return 1;
} }
fd = open_file_or_dir(subvol); fd = open_file_or_dir(subvol);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "ERROR: can't access '%s'\n", subvol); fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
return 12; return 1;
} }
ret = btrfs_list_get_default_subvolume(fd, &default_id); ret = btrfs_list_get_default_subvolume(fd, &default_id);
if (ret) { if (ret) {
fprintf(stderr, "ERROR: can't perform the search - %s\n", fprintf(stderr, "ERROR: can't perform the search - %s\n",
strerror(errno)); strerror(errno));
return ret; goto out;
} }
ret = 1;
if (default_id == 0) { if (default_id == 0) {
fprintf(stderr, "ERROR: 'default' dir item not found\n"); fprintf(stderr, "ERROR: 'default' dir item not found\n");
return ret; goto out;
} }
/* no need to resolve roots if FS_TREE is default */ /* no need to resolve roots if FS_TREE is default */
if (default_id == BTRFS_FS_TREE_OBJECTID) { if (default_id == BTRFS_FS_TREE_OBJECTID) {
printf("ID 5 (FS_TREE)\n"); printf("ID 5 (FS_TREE)\n");
return ret; goto out;
} }
filter_set = btrfs_list_alloc_filter_set(); filter_set = btrfs_list_alloc_filter_set();
@ -684,8 +685,11 @@ static int cmd_subvol_get_default(int argc, char **argv)
if (filter_set) if (filter_set)
btrfs_list_free_filter_set(filter_set); btrfs_list_free_filter_set(filter_set);
out:
if (fd != -1)
close(fd);
if (ret) if (ret)
return 19; return 1;
return 0; return 0;
} }