From nobody Sun Dec 14 06:34:42 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 C4153C25B4E for ; Fri, 20 Jan 2023 15:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231429AbjATPZA (ORCPT ); Fri, 20 Jan 2023 10:25:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231420AbjATPYw (ORCPT ); Fri, 20 Jan 2023 10:24:52 -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 CB2CBDA127 for ; Fri, 20 Jan 2023 07:23:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674228239; 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=M9kcFm4bZIrWxqb92kaZI81madTzRGEizfXuC8UiNAg=; b=FEiZuFbRK8ptJmmJI4EGINeo3zSRMF8AAFbx3kyX1KiZH8HeZN+ZxTZeq6wpq//XW2Hdhv 4GQmuN/mfX3deZJCPnGEg2b1AD5n75wb9DMWkxjBUAbV6XkFAv0tPVd7p+FpBKWXa/yntw 2SjjnsBMMUbghwHE5aV4uE7vdexTIVg= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-647-h8K_wuihOz-N6GP2AeTkQA-1; Fri, 20 Jan 2023 10:23:58 -0500 X-MC-Unique: h8K_wuihOz-N6GP2AeTkQA-1 Received: by mail-ej1-f71.google.com with SMTP id wz4-20020a170906fe4400b0084c7e7eb6d0so3999615ejb.19 for ; Fri, 20 Jan 2023 07:23:57 -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=M9kcFm4bZIrWxqb92kaZI81madTzRGEizfXuC8UiNAg=; b=E8N4wygG05/CY7hqO+ye15uwDvukUSa4wCtpZL4uyjS6FTiKnfZ1eJ5qixx/jZVvec qSBC/UyURlzTnIfedArSAQNpKZFR14SFigUTUwn7RFPTELHbilSzdZGnldAm3xbL/gFM nzRz7F7VHrUMb7v+RUjNXBZUJzO1o2/LsaH6JRBcB+6gAhO3x96DGvVEtIm6rB8DYJc5 QCKPaTtl78Pi3j6iY3TyApMuejf/1F40nPG+df6sbmAs9wSdKTaDL9wzN/SrRfoRExsg q5v9pHzeiTKjfcHKNtRQtmbX+1cQPaJ/M1PcB08R7tdUm56oo1pZkNxcwidxTasoGkV5 jGlQ== X-Gm-Message-State: AFqh2kpGsORg76srOrvc9WwSQy7TKo0ACzYY5xhcitQlm83ogvE6OVb8 rddxfbpxZKd1wxZudQESD1uuM/K9/1ITkJTyR5jQcqQTfUL+U87CaGe+Fjo5so+2wtiQMGOV5Cu dJKLx899nP8F+8BpceHBeuR0c X-Received: by 2002:a17:907:8e8c:b0:86f:fbcf:f30a with SMTP id tx12-20020a1709078e8c00b0086ffbcff30amr17256937ejc.58.1674228236684; Fri, 20 Jan 2023 07:23:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXu9qkCLMflGLnlHw4DtZmrXLGQEq54VRSN4Eh5U4Z+xTENpAmtCMu5VVcOv2DCIdzj6GA3G8Q== X-Received: by 2002:a17:907:8e8c:b0:86f:fbcf:f30a with SMTP id tx12-20020a1709078e8c00b0086ffbcff30amr17256918ejc.58.1674228236482; Fri, 20 Jan 2023 07:23:56 -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 s16-20020a1709067b9000b00872eb47f46dsm5706976ejo.19.2023.01.20.07.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 07:23:55 -0800 (PST) From: Alexander Larsson To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, gscrivan@redhat.com, david@fromorbit.com, brauner@kernel.org, viro@zeniv.linux.org.uk, Alexander Larsson Subject: [PATCH v3 6/6] composefs: Add kconfig and build support Date: Fri, 20 Jan 2023 16:23:34 +0100 Message-Id: <44514e018d5fa27ace5c97c6c30e95a9cca89032.1674227308.git.alexl@redhat.com> X-Mailer: git-send-email 2.39.0 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.39.0