From nobody Fri Sep 19 07:15:46 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C892CC43217 for ; Mon, 28 Nov 2022 11:19:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231293AbiK1LTg (ORCPT ); Mon, 28 Nov 2022 06:19:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230123AbiK1LSz (ORCPT ); Mon, 28 Nov 2022 06:18:55 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B0F71A061 for ; Mon, 28 Nov 2022 03:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669634271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bfBW73LGL9+SMTcT0q3UKBY6n7ebNKGVYFSRGPrdczE=; b=MvuMVSZNHXqapxtUIzdA8vfjBBX3aNG5S1ca/Pg+4uOLc4PwD8vtW+FIeMkDIfEZx6u6EN P3rstCT5fK7U2PfPycla9Zy8VpmrxSYX7j8JsRS4Skvq5QjrYH2Eky18MTE/RGRaFwbTb8 DJVzWUUKLQbd7CSZpMHmMYYLDWkYN5A= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-245-NxOe1aT9Ncmafmcr2h4A-A-1; Mon, 28 Nov 2022 06:17:50 -0500 X-MC-Unique: NxOe1aT9Ncmafmcr2h4A-A-1 Received: by mail-lf1-f72.google.com with SMTP id q2-20020ac24a62000000b004b4ec7b83f3so3648781lfp.19 for ; Mon, 28 Nov 2022 03:17:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bfBW73LGL9+SMTcT0q3UKBY6n7ebNKGVYFSRGPrdczE=; b=zEPgumCABQATUWc2QL4OBlfuaqLcIXYJjqIYkxgHVLK6hucCFp/5tEzX52yAqNsB8d fM16dZWlT2e2Z6ELsaymHi8kUt73dRNIo5VFiOxsNb9fZSm17wyx1SHP2zSIpsih1U6X 5he9QvXK93Tcd8+OAW5NOePF2oUY2sf8410ox7UAUJvAJtfl51dOluJMFD0beMZgWo/4 EVCusK/PZ+LYHRo8C5y3IccriOfMHhwzG2CZjNu0KGuW83IHL1HdDuHwN0tI8eZiF9qw PY8M6pLzYlfLVioLdpAfgB9H2JBCDEo33cYmwZXTCPI1zY5WC0aw9IYVXJxmD7pNlZf1 tdUQ== X-Gm-Message-State: ANoB5plx1OUaVd3ZAATuUhWg56kGZ+wHWAqE7OWI/iRdDCT4pxr8PjEq 6WTLobcXm5txbJs8Y21GdYkpghZZ5cKYb2QNssO+OMuNpWzOvRWc0DxbvXL/Oikwgck+C5yKLNl O9COTDoNz+K84qvorc0WGlFd/ X-Received: by 2002:a19:6917:0:b0:4b0:2da9:55d0 with SMTP id e23-20020a196917000000b004b02da955d0mr10495820lfc.187.1669634268568; Mon, 28 Nov 2022 03:17:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf4mc5mXsUXD1MdME9y94GOyO8gtF9VyPiX8dxqD782++BQhr3pi0l1rgNCaW19RrCU5CChosQ== X-Received: by 2002:a19:6917:0:b0:4b0:2da9:55d0 with SMTP id e23-20020a196917000000b004b02da955d0mr10495813lfc.187.1669634268372; Mon, 28 Nov 2022 03:17:48 -0800 (PST) Received: from localhost.localdomain (c-e6a5e255.022-110-73746f36.bbcust.telenor.se. [85.226.165.230]) by smtp.googlemail.com with ESMTPSA id t1-20020ac25481000000b0048a982ad0a8sm1699609lfk.23.2022.11.28.03.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 03:17:47 -0800 (PST) From: Alexander Larsson To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, gscrivan@redhat.com, alexl@redhat.com Subject: [PATCH 6/6] composefs: Add kconfig and build support Date: Mon, 28 Nov 2022 12:17:39 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This commit adds Makefile and Kconfig for composefs, and updates Makefile and Kconfig files in the fs directory Signed-off-by: Alexander Larsson --- fs/Kconfig | 1 + fs/Makefile | 1 + fs/composefs/Kconfig | 18 ++++++++++++++++++ fs/composefs/Makefile | 5 +++++ 4 files changed, 25 insertions(+) create mode 100644 fs/composefs/Kconfig create mode 100644 fs/composefs/Makefile diff --git a/fs/Kconfig b/fs/Kconfig index 2685a4d0d353..de8493fc2b1e 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -127,6 +127,7 @@ source "fs/quota/Kconfig" source "fs/autofs/Kconfig" source "fs/fuse/Kconfig" source "fs/overlayfs/Kconfig" +source "fs/composefs/Kconfig" =20 menu "Caches" =20 diff --git a/fs/Makefile b/fs/Makefile index 4dea17840761..d16974e02468 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -137,3 +137,4 @@ obj-$(CONFIG_EFIVAR_FS) +=3D efivarfs/ obj-$(CONFIG_EROFS_FS) +=3D erofs/ obj-$(CONFIG_VBOXSF_FS) +=3D vboxsf/ obj-$(CONFIG_ZONEFS_FS) +=3D zonefs/ +obj-$(CONFIG_COMPOSEFS_FS) +=3D composefs/ diff --git a/fs/composefs/Kconfig b/fs/composefs/Kconfig new file mode 100644 index 000000000000..88c5b55380e6 --- /dev/null +++ b/fs/composefs/Kconfig @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config COMPOSEFS_FS + tristate "Composefs filesystem support" + select EXPORTFS + help + Composefs is a filesystem that allows combining file content from + existing regular files with a metadata directory structure from + a separate binary file. This is useful to share file content between + many different directory trees, such as in a local container image stor= e. + + Composefs also allows using fs-verity to validate the content of the + content-files as well as the metadata file which allows dm-verity + like validation with the flexibility of regular files. + + For more information see Documentation/filesystems/composefs.rst + + If unsure, say N. diff --git a/fs/composefs/Makefile b/fs/composefs/Makefile new file mode 100644 index 000000000000..eac8445e7d25 --- /dev/null +++ b/fs/composefs/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_COMPOSEFS_FS) +=3D composefs.o + +composefs-objs +=3D cfs-reader.o cfs.o --=20 2.38.1