[f2fs-dev] [PATCH 1/2] f2fs-tools: fix to use HDIO_GETGEO instead of HDIO_GETGIO

[f2fs-dev] [PATCH 1/2] f2fs-tools: fix to use HDIO_GETGEO instead of HDIO_GETGIO

[Chao Yu via Linux-f2fs-devel]

There is no definition of HDIO_GETGIO, it should be a typo, let's use
HDIO_GETGEO instead.

Reported-by: Chenghao Fan <23b903068@stu.hit.edu.cn>
Signed-off-by: Chao Yu <chao@kernel.org>
---
 lib/libf2fs.c  | 4 ++--
 tools/fibmap.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/libf2fs.c b/lib/libf2fs.c
index 13e4d0d..843494e 100644
--- a/lib/libf2fs.c
+++ b/lib/libf2fs.c
@@ -953,7 +953,7 @@ int get_device_info(int i)
 	uint32_t total_sectors;
 #endif
 	struct stat *stat_buf;
-#ifdef HDIO_GETGIO
+#ifdef HDIO_GETGEO
 	struct hd_geometry geom;
 #endif
 #if !defined(WITH_ANDROID) && defined(__linux__)
@@ -1062,7 +1062,7 @@ int get_device_info(int i)
 		dev->total_sectors /= dev->sector_size;
 
 		if (i == 0) {
-#ifdef HDIO_GETGIO
+#ifdef HDIO_GETGEO
 			if (ioctl(fd, HDIO_GETGEO, &geom) < 0)
 				c.start_sector = 0;
 			else
diff --git a/tools/fibmap.c b/tools/fibmap.c
index 3acc77b..0a92551 100644
--- a/tools/fibmap.c
+++ b/tools/fibmap.c
@@ -88,7 +88,7 @@ static void stat_bdev(struct stat *st, unsigned int *start_lba)
 #endif
 {
 	struct stat bdev_stat;
-#ifdef HDIO_GETGIO
+#ifdef HDIO_GETGEO
 	struct hd_geometry geom;
 #endif
 	char devname[32] = { 0, };
@@ -105,7 +105,7 @@ static void stat_bdev(struct stat *st, unsigned int *start_lba)
 		goto out;
 
 	if (S_ISBLK(bdev_stat.st_mode)) {
-#ifdef HDIO_GETGIO
+#ifdef HDIO_GETGEO
 		if (ioctl(fd, HDIO_GETGEO, &geom) < 0)
 			*start_lba = 0;
 		else
-- 
2.49.0



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

[f2fs-dev] [PATCH 2/2] f2fs-tools: fix to avoid uninitialized variable access

[Chao Yu via Linux-f2fs-devel]

Fix below compile warning:

  CC       fibmap.o
In function ‘stat_bdev’,
    inlined from ‘main’ at fibmap.c:171:2:
fibmap.c:123:9: warning: ‘start_lba’ may be used uninitialized [-Wmaybe-uninitialized]
  123 |         printf("start_lba = %u\n", *start_lba);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fibmap.c: In function ‘main’:
fibmap.c:143:15: note: ‘start_lba’ was declared here
  143 |         __u32 start_lba;
      |               ^~~~~~~~~

Signed-off-by: Chao Yu <chao@kernel.org>
---
 tools/fibmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/fibmap.c b/tools/fibmap.c
index 0a92551..dea5361 100644
--- a/tools/fibmap.c
+++ b/tools/fibmap.c
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 	int total_blks;
 	unsigned int i;
 	struct file_ext ext;
-	__u32 start_lba;
+	__u32 start_lba = 0;
 	__u32 blknum;
 
 	if (argc != 2) {
-- 
2.49.0



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel