Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcd53741 authored by Arne Jansen's avatar Arne Jansen
Browse files

btrfs: move btrfs_cmp_device_free_bytes to super.c 

this function won't be used here anymore, so move it super.c where it is
used for df-calculation
parent 7cf96da3

fs/btrfs/super.c

+26 −0
Original line number Diff line number Diff line
@@ -913,6 +913,32 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) 
	return 0;

}



/* Used to sort the devices by max_avail(descending sort) */

static int btrfs_cmp_device_free_bytes(const void *dev_info1,

				       const void *dev_info2)

{

	if (((struct btrfs_device_info *)dev_info1)->max_avail >

	    ((struct btrfs_device_info *)dev_info2)->max_avail)

		return -1;

	else if (((struct btrfs_device_info *)dev_info1)->max_avail <

		 ((struct btrfs_device_info *)dev_info2)->max_avail)

		return 1;

	else

	return 0;

}



/*

 * sort the devices by max_avail, in which max free extent size of each device

 * is stored.(Descending Sort)

 */

static inline void btrfs_descending_sort_devices(

					struct btrfs_device_info *devices,

					size_t nr_devices)

{

	sort(devices, nr_devices, sizeof(struct btrfs_device_info),

	     btrfs_cmp_device_free_bytes, NULL);

}



/*

 * The helper to calc the free space on the devices that can be used to store

 * file data.

fs/btrfs/volumes.c

+0 −13
Original line number Diff line number Diff line
@@ -2282,19 +2282,6 @@ static noinline u64 chunk_bytes_by_type(u64 type, u64 calc_size, 
		return calc_size * num_stripes;

}



/* Used to sort the devices by max_avail(descending sort) */

int btrfs_cmp_device_free_bytes(const void *dev_info1, const void *dev_info2)

{

	if (((struct btrfs_device_info *)dev_info1)->max_avail >

	    ((struct btrfs_device_info *)dev_info2)->max_avail)

		return -1;

	else if (((struct btrfs_device_info *)dev_info1)->max_avail <

		 ((struct btrfs_device_info *)dev_info2)->max_avail)

		return 1;

	else

		return 0;

}



static int __btrfs_calc_nstripes(struct btrfs_fs_devices *fs_devices, u64 type,

				 int *num_stripes, int *min_stripes,

				 int *sub_stripes)

fs/btrfs/volumes.h

+0 −15
Original line number Diff line number Diff line
@@ -157,21 +157,6 @@ struct map_lookup { 
	struct btrfs_bio_stripe stripes[];

};



/* Used to sort the devices by max_avail(descending sort) */

int btrfs_cmp_device_free_bytes(const void *dev_info1, const void *dev_info2);



/*

 * sort the devices by max_avail, in which max free extent size of each device

 * is stored.(Descending Sort)

 */

static inline void btrfs_descending_sort_devices(

					struct btrfs_device_info *devices,

					size_t nr_devices)

{

	sort(devices, nr_devices, sizeof(struct btrfs_device_info),

	     btrfs_cmp_device_free_bytes, NULL);

}



int btrfs_account_dev_extents_size(struct btrfs_device *device, u64 start,

				   u64 end, u64 *length);