public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: u-boot@lists.denx.de
Subject: [PATCH 2/3] fs/squashfs: use "struct disk_partition" instead of "disk_partition_t"
Date: Wed, 15 Jul 2020 22:11:42 +0200	[thread overview]
Message-ID: <20200715201143.2168632-3-thomas.petazzoni@bootlin.com> (raw)
In-Reply-To: <20200715201143.2168632-1-thomas.petazzoni@bootlin.com>

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

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@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

  parent reply	other threads:[~2020-07-15 20:11 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-09 17:51 [PATCH 0/4] Add support for the SquashFS filesystem Joao Marcos Costa
2020-07-09 17:51 ` [PATCH 1/4] fs/squashfs: new filesystem Joao Marcos Costa
2020-07-09 19:50   ` Rasmus Villemoes
2020-07-09 20:19     ` Joao Marcos Costa
2020-07-10  8:29     ` Thomas Petazzoni
2020-07-10  8:54       ` Rasmus Villemoes
2020-07-10  9:13         ` Thomas Petazzoni
2020-07-15 21:56           ` Tom Rini
2020-07-15 21:55   ` Tom Rini
2020-07-09 17:51 ` [PATCH 2/4] fs/squashfs: add filesystem commands Joao Marcos Costa
2020-07-09 17:51 ` [PATCH 3/4] fs/squashfs: add sources for zlib decompression Joao Marcos Costa
2020-07-15 19:37   ` Thomas Petazzoni
2020-07-09 17:51 ` [PATCH 4/4] fs/squashfs: add support " Joao Marcos Costa
2020-07-15 20:11 ` [PATCH 0/3] squashfs fixes Thomas Petazzoni
2020-07-15 20:11   ` [PATCH 1/3] cmd/sqfs.c, include/fs.h: fix build failures, don't expose do_sqfs_*() functions globally Thomas Petazzoni
2020-07-15 20:11   ` Thomas Petazzoni [this message]
2020-07-15 20:11   ` [PATCH 3/3] fs/squashfs: do not use CMD_RET_* defines in the filesystem code Thomas Petazzoni
2020-07-16  7:51   ` [PATCH 0/3] squashfs fixes Joao Marcos Costa
2020-07-16  8:33     ` Thomas Petazzoni
2020-07-15 20:22 ` [PATCH] fs/squashfs/sqfs.c: use sqfs_read_sblk() in sqfs_probe() Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200715201143.2168632-3-thomas.petazzoni@bootlin.com \
    --to=thomas.petazzoni@bootlin.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox