[PATCH 2/3] fs/squashfs: use "struct disk_partition" instead of "disk_partition_t"

Thomas Petazzoni thomas.petazzoni at bootlin.com
Wed Jul 15 22:11:42 CEST 2020


disk_partition_t was dropped in 0528979fa7ab ("part: Drop
disk_partition_t typedef").

Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
 fs/squashfs/sqfs.c | 5 +++--
 include/squashfs.h | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c
index 3302a63cca..8d43564b50 100644
--- a/fs/squashfs/sqfs.c
+++ b/fs/squashfs/sqfs.c
@@ -17,12 +17,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <squashfs.h>
+#include <part.h>
 
 #include "sqfs_decompressor.h"
 #include "sqfs_filesystem.h"
 #include "sqfs_utils.h"
 
-static disk_partition_t cur_part_info;
+static struct disk_partition cur_part_info;
 static struct blk_desc *cur_dev;
 
 static int sqfs_disk_read(__u32 block, __u32 nr_blocks, void *buf)
@@ -1013,7 +1014,7 @@ int sqfs_readdir(struct fs_dir_stream *fs_dirs, struct fs_dirent **dentp)
 	return SQFS_CONTINUE_READDIR;
 }
 
-int sqfs_probe(struct blk_desc *fs_dev_desc, disk_partition_t *fs_partition)
+int sqfs_probe(struct blk_desc *fs_dev_desc, struct disk_partition *fs_partition)
 {
 	struct squashfs_super_block *sblk;
 
diff --git a/include/squashfs.h b/include/squashfs.h
index ec59eee8d8..4dd390d8b6 100644
--- a/include/squashfs.h
+++ b/include/squashfs.h
@@ -10,11 +10,13 @@
 #ifndef _SQFS_H_
 #define _SQFS_H_
 
+struct disk_partition;
+
 int sqfs_opendir(const char *filename, struct fs_dir_stream **dirsp);
 int sqfs_ls(const char *filename);
 int sqfs_readdir(struct fs_dir_stream *dirs, struct fs_dirent **dentp);
 int sqfs_probe(struct blk_desc *fs_dev_desc,
-	       disk_partition_t *fs_partition);
+	       struct disk_partition *fs_partition);
 int sqfs_read(const char *filename, void *buf, loff_t offset,
 	      loff_t len, loff_t *actread);
 int sqfs_size(const char *filename, loff_t *size);
-- 
2.26.2



More information about the U-Boot mailing list