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

btrfs-progs: use on-stack buffer for btrfs_scan_one_device 

Signed-off-by: David Sterba <dsterba@suse.com>
master
David Sterba 2015-11-06 17:09:17 +01:00
parent b13197d68f
commit 7ae478d8af
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
volumes.c
View File

@ -252,21 +252,14 @@ int btrfs_scan_one_device(int fd, const char *path,
u64 *total_devs, u64 super_offset, int super_recover)
{
struct btrfs_super_block *disk_super;
char *buf;
char buf[BTRFS_SUPER_INFO_SIZE];
int ret;
u64 devid;
buf = malloc(4096);
if (!buf) {
ret = -ENOMEM;
goto error;
}
disk_super = (struct btrfs_super_block *)buf;
ret = btrfs_read_dev_super(fd, disk_super, super_offset, super_recover);
if (ret < 0) {
ret = -EIO;
goto error_brelse;
}
if (ret < 0)
return -EIO;
devid = btrfs_stack_device_id(&disk_super->dev_item);
if (btrfs_super_flags(disk_super) & BTRFS_SUPER_FLAG_METADUMP)
*total_devs = 1;
@ -275,9 +268,6 @@ int btrfs_scan_one_device(int fd, const char *path,
ret = device_list_add(path, disk_super, devid, fs_devices_ret);
error_brelse:
free(buf);
error:
return ret;
}