RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-13 16:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: add prefix to discard_blocks

Browse Source 
This is a helper for devices, make it clear in the function name.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2021-04-29 18:34:05 +02:00
parent 43ea336e17
commit aed8243eb1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/device-utils.c
View File

@ -50,7 +50,7 @@ static int discard_range(int fd, u64 start, u64 len)
/*
* Discard blocks in the given range in 1G chunks, the process is interruptible
*/
int discard_blocks(int fd, u64 start, u64 len)
int device_discard_blocks(int fd, u64 start, u64 len)
{
while (len > 0) {
/* 1G granularity */
@ -221,7 +221,7 @@ int btrfs_prepare_device(int fd, const char *file, u64 *block_count_ret,
if (opflags & PREP_DEVICE_VERBOSE)
printf("Performing full device TRIM %s (%s) ...\n",
file, pretty_size(block_count));
discard_blocks(fd, 0, block_count);
device_discard_blocks(fd, 0, block_count);
}
}

2
common/device-utils.h
View File

@ -25,7 +25,7 @@
#define PREP_DEVICE_VERBOSE (1U << 2)
#define PREP_DEVICE_ZONED (1U << 3)
int discard_blocks(int fd, u64 start, u64 len);
int device_discard_blocks(int fd, u64 start, u64 len);
int zero_blocks(int fd, off_t start, size_t len);
u64 get_partition_size(const char *dev);
u64 disk_size(const char *path);

2
kernel-shared/zoned.c
View File

@ -373,7 +373,7 @@ int btrfs_reset_all_zones(int fd, struct btrfs_zoned_device_info *zinfo)
/* Zone size granularity */
for (i = 0; i < zinfo->nr_zones; i++) {
if (zinfo->zones[i].type == BLK_ZONE_TYPE_CONVENTIONAL) {
ret = discard_blocks(fd,
ret = device_discard_blocks(fd,
zinfo->zones[i].start << SECTOR_SHIFT,
zinfo->zone_size);
if (ret == EOPNOTSUPP)