logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-Prevent-unused-but-set-variables.patch (1314B)

    

  1. From 19375b1476921178f4af5a74708239b3671cd56e Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Fri, 5 Jun 2020 02:10:12 -0700
  4. Subject: [PATCH] Prevent unused-but-set variables
  6. ---
  7.  mkfs/f2fs_format_utils.c | 8 +++++---
  8.  1 file changed, 5 insertions(+), 3 deletions(-)
  10. diff --git a/mkfs/f2fs_format_utils.c b/mkfs/f2fs_format_utils.c
  11. index f2d55ad..76f5a1e 100644
  12. --- a/mkfs/f2fs_format_utils.c
  13. +++ b/mkfs/f2fs_format_utils.c
  14. @@ -49,11 +49,13 @@
  15.  static int trim_device(int i)
  16.  {
  17.  #ifndef ANDROID_WINDOWS_HOST
  18. -	unsigned long long range[2];
  19.  	struct stat *stat_buf;
  20.  	struct device_info *dev = c.devices + i;
  21. -	u_int64_t bytes = dev->total_sectors * dev->sector_size;
  22.  	int fd = dev->fd;
  23. +#if defined(WITH_BLKDISCARD) && defined(BLKDISCARD)
  24. +	unsigned long long range[2];
  25. +	u_int64_t bytes = dev->total_sectors * dev->sector_size;
  26. +#endif
  27.  
  28.  	stat_buf = malloc(sizeof(struct stat));
  29.  	if (stat_buf == NULL) {
  30. @@ -67,10 +69,10 @@ static int trim_device(int i)
  31.  		return -1;
  32.  	}
  33.  
  34. +#if defined(WITH_BLKDISCARD) && defined(BLKDISCARD)
  35.  	range[0] = 0;
  36.  	range[1] = bytes;
  37.  
  38. -#if defined(WITH_BLKDISCARD) && defined(BLKDISCARD)
  39.  	MSG(0, "Info: [%s] Discarding device\n", dev->path);
  40.  	if (S_ISREG(stat_buf->st_mode)) {
  41.  #if defined(HAVE_FALLOCATE) && defined(FALLOC_FL_PUNCH_HOLE)
  42. -- 
  43. 2.27.0