From patchwork Wed Jul 15 20:11:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1329788 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6T7m0nfsz9sRk for ; Thu, 16 Jul 2020 06:12:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E830281BEC; Wed, 15 Jul 2020 22:12:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 6DCCF81B6E; Wed, 15 Jul 2020 22:11:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3795E81B6E for ; Wed, 15 Jul 2020 22:11:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=thomas.petazzoni@bootlin.com X-Originating-IP: 90.30.52.66 Received: from localhost (lfbn-bay-1-589-66.w90-30.abo.wanadoo.fr [90.30.52.66]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 455C820002; Wed, 15 Jul 2020 20:11:50 +0000 (UTC) From: Thomas Petazzoni To: Joao Marcos Costa Cc: u-boot@lists.denx.de, miquel.raynal@bootlin.com, Thomas Petazzoni Subject: [PATCH 2/3] fs/squashfs: use "struct disk_partition" instead of "disk_partition_t" Date: Wed, 15 Jul 2020 22:11:42 +0200 Message-Id: <20200715201143.2168632-3-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715201143.2168632-1-thomas.petazzoni@bootlin.com> References: <20200709175148.17193-1-joaomarcos.costa@bootlin.com> <20200715201143.2168632-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean disk_partition_t was dropped in 0528979fa7ab ("part: Drop disk_partition_t typedef"). Signed-off-by: Thomas Petazzoni --- 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 #include #include +#include #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);