From patchwork Sun Dec 29 23:37:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Lougher X-Patchwork-Id: 13922871 Received: from sxb1plsmtpa01-12.prod.sxb1.secureserver.net (sxb1plsmtpa01-12.prod.sxb1.secureserver.net [92.204.81.231]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56D8319939D for ; Sun, 29 Dec 2024 23:46:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=92.204.81.231 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735515993; cv=none; b=ZZJsmli0GgGd9F06D5LCm/RiKiNkL/krMgoMAsxEsUDjQqGQ+mQ7esS/Jra3YXPTvPo629GNFp7tw5Vn2ubw9AGeG3J0FEHW61pLV1ZPCfy4uHe4PXOwPh6yv9L1zm+vxA36I8eBsKLayfohrzhg6o2kVKHu9iA/e9fwZ5qN0Fs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735515993; c=relaxed/simple; bh=7h17NvmeBVfmvRhFrDSw49oLJIF/d9PDoPZ8iQfKR3s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S/EmbdcGEr3zXCxelhmUXP2B7F2cU+aUQf8FkvTuGV7MUnqVthj5yWl5RmOR7HAqzTsKl1EQJGUVx3/EXl8AwKlTZPfwVK4BdKJVelRha9uaZ3sd0O6bh145srG8mvZXAEY/xBq8wgCcldvg5PdLg6BDx6Mp72Ec/OYYFrGkkY4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=squashfs.org.uk; spf=pass smtp.mailfrom=squashfs.org.uk; arc=none smtp.client-ip=92.204.81.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=squashfs.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=squashfs.org.uk Received: from raspberrypi.fritz.box ([82.69.79.175]) by :SMTPAUTH: with ESMTPA id S2rotGQTRxZ1ZS2rxtFiTi; Sun, 29 Dec 2024 16:38:50 -0700 X-CMAE-Analysis: v=2.4 cv=S8MjwJsP c=1 sm=1 tr=0 ts=6771dd8b a=84ok6UeoqCVsigPHarzEiQ==:117 a=84ok6UeoqCVsigPHarzEiQ==:17 a=FXvPX3liAAAA:8 a=T0oYn0MT_amATRHXiuYA:9 a=UObqyxdv-6Yh2QiB9mM_:22 X-SECURESERVER-ACCT: phillip@squashfs.org.uk From: Phillip Lougher To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org Cc: Phillip Lougher Subject: [PATCH 1/4] squashfs: make squashfs_cache_init() return ERR_PTR(-ENOMEM) Date: Sun, 29 Dec 2024 23:37:49 +0000 Message-Id: <20241229233752.54481-2-phillip@squashfs.org.uk> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241229233752.54481-1-phillip@squashfs.org.uk> References: <20241229233752.54481-1-phillip@squashfs.org.uk> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CMAE-Envelope: MS4xfE/udWkNi1AjlSTQMXTQa5ounKeB2YssuS7Nn/5fe27ETjX9cdHx+kWs+5dgxv5vZtYeIoWTLf99lBR15bb8yNE1e8c/n5YZRPsKhavOQYA5447TQUjJ bE07yaYY986n/PDt89wTXC9rNd4vtOm/9h/P0bz7Ff220Tbc69fIgiH5+pOKdowSFJSoTWRWg7xLeSRNFitPHfT2ARxDoHgC8Tg4JiZLHR0FWxLpwxU9eZ6A 7ral6O4wXNswrH+HbAmWZSuq/vNhH6q7rtZIvZ5fsszJaP1TiM/MC7XEAPboMEAcCOSTXYn1nJPD9PnawSWBIpm0aWWyaqgWuIuQHcinbJY= Make squashfs_cache_init() return an ERR_PTR(-ENOMEM) on failure rather than NULL. This tidies up some calling code, but, it also allows NULL to be returned as a valid result when a cache hasn't be allocated. Signed-off-by: Phillip Lougher --- fs/squashfs/cache.c | 10 +++++++--- fs/squashfs/super.c | 17 ++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c index 5062326d0efb..4db0d2b0aab8 100644 --- a/fs/squashfs/cache.c +++ b/fs/squashfs/cache.c @@ -224,11 +224,15 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries, int block_size) { int i, j; - struct squashfs_cache *cache = kzalloc(sizeof(*cache), GFP_KERNEL); + struct squashfs_cache *cache; + if (entries == 0) + return NULL; + + cache = kzalloc(sizeof(*cache), GFP_KERNEL); if (cache == NULL) { ERROR("Failed to allocate %s cache\n", name); - return NULL; + return ERR_PTR(-ENOMEM); } cache->entry = kcalloc(entries, sizeof(*(cache->entry)), GFP_KERNEL); @@ -281,7 +285,7 @@ struct squashfs_cache *squashfs_cache_init(char *name, int entries, cleanup: squashfs_cache_delete(cache); - return NULL; + return ERR_PTR(-ENOMEM); } diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c index 269c6d61bc29..fedae8dbc5de 100644 --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c @@ -314,26 +314,29 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_flags |= SB_RDONLY; sb->s_op = &squashfs_super_ops; - err = -ENOMEM; - msblk->block_cache = squashfs_cache_init("metadata", SQUASHFS_CACHED_BLKS, SQUASHFS_METADATA_SIZE); - if (msblk->block_cache == NULL) + if (IS_ERR(msblk->block_cache)) { + err = PTR_ERR(msblk->block_cache); goto failed_mount; + } /* Allocate read_page block */ msblk->read_page = squashfs_cache_init("data", msblk->max_thread_num, msblk->block_size); - if (msblk->read_page == NULL) { + if (IS_ERR(msblk->read_page)) { errorf(fc, "Failed to allocate read_page block"); + err = PTR_ERR(msblk->read_page); goto failed_mount; } if (msblk->devblksize == PAGE_SIZE) { struct inode *cache = new_inode(sb); - if (cache == NULL) + if (cache == NULL) { + err = -ENOMEM; goto failed_mount; + } set_nlink(cache, 1); cache->i_size = OFFSET_MAX; @@ -406,8 +409,8 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc) msblk->fragment_cache = squashfs_cache_init("fragment", min(SQUASHFS_CACHED_FRAGMENTS, fragments), msblk->block_size); - if (msblk->fragment_cache == NULL) { - err = -ENOMEM; + if (IS_ERR(msblk->fragment_cache)) { + err = PTR_ERR(msblk->fragment_cache); goto failed_mount; } From patchwork Sun Dec 29 23:37:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Lougher X-Patchwork-Id: 13922872 Received: from sxb1plsmtpa01-12.prod.sxb1.secureserver.net (sxb1plsmtpa01-12.prod.sxb1.secureserver.net [188.121.53.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 902F82594BE for ; Sun, 29 Dec 2024 23:58:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=188.121.53.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735516684; cv=none; b=qantzv40O0Jn9ZmDPzaaYVGo3bHBxOrF7+D/9yp9LKqP/jY4ZiXAEwhDvzI+6MdHI1x/bowUZXW4QWGO5fDp83nR+FLMN25jelrVCM3mxBvdFOxLNdP92CFAS2loCWvcszLOrRHseV/lA1MKwngzZjOFqX+FfGQJCD+bvIT24gk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735516684; c=relaxed/simple; bh=ookR3hMtlinDMiJs9Ys4VFkXKQROHTaE43ktFjCNRPI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=K4powu7s804+E3rWz3KKiJljEczcj9b4vz6Fm5yO05lPjHCrDC7WlZ9zmA5CsWJDUtvbIN6VQASWp9IIqb5il41zyEpz/TDeLg8rzdu37Br18vdumjJWt/hySrMwgSyna7s8hhSbnq2pUw400h45o6ffRrhhq89CAG+IxddVSBg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=squashfs.org.uk; spf=pass smtp.mailfrom=squashfs.org.uk; arc=none smtp.client-ip=188.121.53.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=squashfs.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=squashfs.org.uk Received: from raspberrypi.fritz.box ([82.69.79.175]) by :SMTPAUTH: with ESMTPA id S2rotGQTRxZ1ZS2rztFiU6; Sun, 29 Dec 2024 16:38:52 -0700 X-CMAE-Analysis: v=2.4 cv=S8MjwJsP c=1 sm=1 tr=0 ts=6771dd8c a=84ok6UeoqCVsigPHarzEiQ==:117 a=84ok6UeoqCVsigPHarzEiQ==:17 a=FXvPX3liAAAA:8 a=LqOhZttQMPkbruw0GBwA:9 a=UObqyxdv-6Yh2QiB9mM_:22 X-SECURESERVER-ACCT: phillip@squashfs.org.uk From: Phillip Lougher To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org Cc: Phillip Lougher Subject: [PATCH 2/4] squashfs: don't allocate read_page cache if SQUASHFS_FILE_DIRECT configured Date: Sun, 29 Dec 2024 23:37:50 +0000 Message-Id: <20241229233752.54481-3-phillip@squashfs.org.uk> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241229233752.54481-1-phillip@squashfs.org.uk> References: <20241229233752.54481-1-phillip@squashfs.org.uk> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CMAE-Envelope: MS4xfDfskyE4LXpm9JvCF0IlQQyVNTmewYv3X2vfK1c1o3WDSAchyl7rcPGaZjA5azw1RNRtX+1CdvkOxjPu+eMUzWOtj1tBaUAzzYSxsofK07TzUteQf2Eh ICqQNbRViwxReV/Eb8/5+k1r5krwuXjWjEceQRuNiI2Z2bH34JJXFy+jAzRQL0q8z0j7qsiMBDKgaxWyR5uZy4RXRWgp3CKl9/RBCva1jBGddKgtKntXZbO6 2FM0I7kWYixdMMgVtgJOs/217SQ1oXGHTFLH2b/okra0MclOQ5NiToaYvMKNH1lPX7vKRIUGmulM/VJHpJhthHXV17oFeix1OZSYG9gaPgM= If Squashfs has been configured to directly read datablocks into the page cache (SQUASHFS_FILE_DIRECT), then the read_page cache is unnecessary. This improvement is due to the following two commits, which added the ability to read datablocks into the page cache when pages were missing, enabling the fallback which used an intermediate buffer to be removed. commit f268eedddf359 ("squashfs: extend "page actor" to handle missing pages") commit 1bb1a07afad97 ("squashfs: don't use intermediate buffer if pages missing") This reduces the amount of memory used when mounting a filesystem by block_size * maximum number of threads. Signed-off-by: Phillip Lougher --- fs/squashfs/squashfs.h | 6 ++++++ fs/squashfs/super.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h index 37f3518a804a..218868b20f16 100644 --- a/fs/squashfs/squashfs.h +++ b/fs/squashfs/squashfs.h @@ -14,6 +14,12 @@ #define WARNING(s, args...) pr_warn("SQUASHFS: "s, ## args) +#ifdef CONFIG_SQUASHFS_FILE_CACHE +#define SQUASHFS_READ_PAGES msblk->max_thread_num +#else +#define SQUASHFS_READ_PAGES 0 +#endif + /* block.c */ extern int squashfs_read_data(struct super_block *, u64, int, u64 *, struct squashfs_page_actor *); diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c index fedae8dbc5de..67c55fe32ce8 100644 --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c @@ -323,7 +323,7 @@ static int squashfs_fill_super(struct super_block *sb, struct fs_context *fc) /* Allocate read_page block */ msblk->read_page = squashfs_cache_init("data", - msblk->max_thread_num, msblk->block_size); + SQUASHFS_READ_PAGES, msblk->block_size); if (IS_ERR(msblk->read_page)) { errorf(fc, "Failed to allocate read_page block"); err = PTR_ERR(msblk->read_page); From patchwork Sun Dec 29 23:37:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Lougher X-Patchwork-Id: 13922866 Received: from sxb1plsmtpa01-12.prod.sxb1.secureserver.net (sxb1plsmtpa01-12.prod.sxb1.secureserver.net [188.121.53.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63AD619882F for ; Sun, 29 Dec 2024 23:41:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=188.121.53.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735515686; cv=none; b=oEqJVJEh9tJLzyShNls7zXkB1dPRGhe6s8wuxsEFEp/+G2vuGrNGHyWem/q59HmU5wHxdEQm8H5zz1BLt/2fkKVzZjsBi22efLFCpsl4E6B30TdxPRIs0Fv3zQcye+d8XdOvWVaW8Yl9QEvVwpcaP6OuAED0cQniOi2kwspv4r0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735515686; c=relaxed/simple; bh=HrfHQrEXWE6KXcctRVRJvbH3DR/f1Rvc4kf5v+IYuTQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TACwZ3eHTDiZEs8ejdcOg0F7nLMnOHu/ZUe9c3ITdUtzruFTkvOGuwE61Ew/ySB2iQa2Y6NoWV0YU3xGqhFCacPS/TNWUbil7mEu0H6MaXp0H2DgpHULauiMmrn2P7srz2SInsnMXiTJsybKl3pYSln2JZSIEM2Y67yo4kL4JyY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=squashfs.org.uk; spf=pass smtp.mailfrom=squashfs.org.uk; arc=none smtp.client-ip=188.121.53.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=squashfs.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=squashfs.org.uk Received: from raspberrypi.fritz.box ([82.69.79.175]) by :SMTPAUTH: with ESMTPA id S2rotGQTRxZ1ZS2s0tFiUA; Sun, 29 Dec 2024 16:38:53 -0700 X-CMAE-Analysis: v=2.4 cv=S8MjwJsP c=1 sm=1 tr=0 ts=6771dd8e a=84ok6UeoqCVsigPHarzEiQ==:117 a=84ok6UeoqCVsigPHarzEiQ==:17 a=aUFYUWTwAAAA:8 a=FXvPX3liAAAA:8 a=FP58Ms26AAAA:8 a=VwQbUJbxAAAA:8 a=NEAV23lmAAAA:8 a=7dKtaLcL_q_8H7sW4w8A:9 a=o1zmNsm2e553tv4nPYj3:22 a=UObqyxdv-6Yh2QiB9mM_:22 X-SECURESERVER-ACCT: phillip@squashfs.org.uk From: Phillip Lougher To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org Cc: Phillip Lougher Subject: [PATCH 3/4] Documentation: update the Squashfs filesystem documentation Date: Sun, 29 Dec 2024 23:37:51 +0000 Message-Id: <20241229233752.54481-4-phillip@squashfs.org.uk> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241229233752.54481-1-phillip@squashfs.org.uk> References: <20241229233752.54481-1-phillip@squashfs.org.uk> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CMAE-Envelope: MS4xfG8CqR9RklzqpChEkxkSycmMku7z5wab+PIvYuO88BVrS6c1FOxyt0AsIHOfm0PoLL47HG5jiXsZd93TkH+4U+itqUrQ3o1Q/KYqrKHNk74JNp2YyjXw dGo7jj6xsrtMhDrhHXc16wwmyWHBcwSl6QUc/N7+GVWeR2v4bKhP76htURYiqvuXvyWzDwLOElcQ/FDOiwVpD3H017JLDsZXRezap2N5MhvbB9t8n0x/3wZr PZbQn7xEhMvcnEMb+6cNydqGg8MzvR+5ze15B+qPsuIoQS5O0vqKXmmbtjTHmMHFhoeBQSdQbs7o4C60ru3vSn2krlA7PzgoXRT6XuaZwLM= This patch updates the following which are out of date. - Zstd has been added to the compression algorithms supported. - The filesystem mailing list (for the kernel code) is changed to linux-fsdevel rather than the now very little used Sourceforge mailing list. - The Squashfs website has been changed to the Squashfs-tools github repository. - The fact that Squashfs-tools is likely packaged by the linux distribution is mentioned. Signed-off-by: Phillip Lougher --- Documentation/filesystems/squashfs.rst | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Documentation/filesystems/squashfs.rst b/Documentation/filesystems/squashfs.rst index 4af8d6207509..45653b3228f9 100644 --- a/Documentation/filesystems/squashfs.rst +++ b/Documentation/filesystems/squashfs.rst @@ -6,7 +6,7 @@ Squashfs 4.0 Filesystem Squashfs is a compressed read-only filesystem for Linux. -It uses zlib, lz4, lzo, or xz compression to compress files, inodes and +It uses zlib, lz4, lzo, xz or zstd compression to compress files, inodes and directories. Inodes in the system are very small and all blocks are packed to minimise data overhead. Block sizes greater than 4K are supported up to a maximum of 1Mbytes (default block size 128K). @@ -16,8 +16,8 @@ use (i.e. in cases where a .tar.gz file may be used), and in constrained block device/memory systems (e.g. embedded systems) where low overhead is needed. -Mailing list: squashfs-devel@lists.sourceforge.net -Web site: www.squashfs.org +Mailing list (kernel code): linux-fsdevel@vger.kernel.org +Web site: github.com/plougher/squashfs-tools 1. Filesystem Features ---------------------- @@ -58,11 +58,9 @@ inodes have different sizes). As squashfs is a read-only filesystem, the mksquashfs program must be used to create populated squashfs filesystems. This and other squashfs utilities -can be obtained from http://www.squashfs.org. Usage instructions can be -obtained from this site also. - -The squashfs-tools development tree is now located on kernel.org - git://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git +are very likely packaged by your linux distribution (called squashfs-tools). +The source code can be obtained from github.com/plougher/squashfs-tools. +Usage instructions can also be obtained from this site. 2.1 Mount options ----------------- From patchwork Sun Dec 29 23:37:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Lougher X-Patchwork-Id: 13922867 Received: from sxb1plsmtpa01-12.prod.sxb1.secureserver.net (sxb1plsmtpa01-12.prod.sxb1.secureserver.net [92.204.81.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 67103199FAC for ; Sun, 29 Dec 2024 23:41:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=92.204.81.230 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735515687; cv=none; b=ofvK79Tuun9WnAYv5flrNJHvehdPNLUGyyY+qFPyH7zS0vlbXG0/MBLVCWPK2S0UdAKS1nGF3JGDaM4oWChKVBot61k43cNgwPPy4cj4W8IKEIBeGbMNNrUAetqv1n+2gKgb43O2TS44IuRXfR1Ha93rlWdKWgnHVCfOv63c1iU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735515687; c=relaxed/simple; bh=HGd8YxJCwgHx/MCB8ncb5eesXC9PLQtWkKkK08EJpGk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PHBC+EFLKdwj23AyoEELZONLCgyDf6kTJo0WO4NSy/LM0wwE01LfhdDGhK2GHsXeMPvxCgLDgO2p4tdVpW0B3ePtLUHqqU7m8GZgRuQl9N7k16+RYQw/o/BLED3qgKm1pRIyjCtHCReccH4WcajarpxCNahDUS5iB7UScdPFjGI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=squashfs.org.uk; spf=pass smtp.mailfrom=squashfs.org.uk; arc=none smtp.client-ip=92.204.81.230 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=squashfs.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=squashfs.org.uk Received: from raspberrypi.fritz.box ([82.69.79.175]) by :SMTPAUTH: with ESMTPA id S2rotGQTRxZ1ZS2s2tFiUE; Sun, 29 Dec 2024 16:38:55 -0700 X-CMAE-Analysis: v=2.4 cv=S8MjwJsP c=1 sm=1 tr=0 ts=6771dd8f a=84ok6UeoqCVsigPHarzEiQ==:117 a=84ok6UeoqCVsigPHarzEiQ==:17 a=FP58Ms26AAAA:8 a=FXvPX3liAAAA:8 a=NEAV23lmAAAA:8 a=JZ5mbIEbMWWLeFFGAloA:9 a=UObqyxdv-6Yh2QiB9mM_:22 X-SECURESERVER-ACCT: phillip@squashfs.org.uk From: Phillip Lougher To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org Cc: Phillip Lougher Subject: [PATCH 4/4] squashfs: update Kconfig information Date: Sun, 29 Dec 2024 23:37:52 +0000 Message-Id: <20241229233752.54481-5-phillip@squashfs.org.uk> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241229233752.54481-1-phillip@squashfs.org.uk> References: <20241229233752.54481-1-phillip@squashfs.org.uk> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CMAE-Envelope: MS4xfF+K+jNMCnrk3EFYgXptn8lBixI67938lKsGaUrNIrkuonoqj1+SwucEnuI8OdO80WbrT+qGTLYiSGaVTKGq+3IMLYnDmk0vkwvn9qNO2JnuqyPgTvsB 9h8exH0kW3Mr48JmSEhDUdiAEDzP8Qz0pm9FOQ/SXt4+XfYTPnZnqZR2e/vEBOzcqzojTRYX15dL0guZYzR5krdlvdQEmbjFt5FWhJTRIaMz5zclIOZONQtK VZNxeIwYLlBX0XsQZfZUzukoO0cGJ2g4EDJUg0kMoW2O1SFmOCUEt0nDVckNv+6RpxA5UbiC8luHWtuTvJC7cjTphF2jNhXiXmHWeEiAz4U= Update the compression algorithms supported, and the Squashfs website location. Signed-off-by: Phillip Lougher --- fs/squashfs/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig index 60fc98bdf421..b1091e70434a 100644 --- a/fs/squashfs/Kconfig +++ b/fs/squashfs/Kconfig @@ -5,8 +5,8 @@ config SQUASHFS help Saying Y here includes support for SquashFS 4.0 (a Compressed Read-Only File System). Squashfs is a highly compressed read-only - filesystem for Linux. It uses zlib, lzo or xz compression to - compress both files, inodes and directories. Inodes in the system + filesystem for Linux. It uses zlib, lz4, lzo, xz or zstd compression + to compress both files, inodes and directories. Inodes in the system are very small and all blocks are packed to minimise data overhead. Block sizes greater than 4K are supported up to a maximum of 1 Mbytes (default block size 128K). SquashFS 4.0 supports 64 bit filesystems @@ -16,7 +16,7 @@ config SQUASHFS Squashfs is intended for general read-only filesystem use, for archival use (i.e. in cases where a .tar.gz file may be used), and in embedded systems where low overhead is needed. Further information - and tools are available from http://squashfs.sourceforge.net. + and tools are available from github.com/plougher/squashfs-tools. If you want to compile this as a module ( = code which can be inserted in and removed from the running kernel whenever you want),