From patchwork Wed Aug 23 13:51:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362576 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 13196EE4993 for ; Wed, 23 Aug 2023 13:51:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236302AbjHWNvt (ORCPT ); Wed, 23 Aug 2023 09:51:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236308AbjHWNvs (ORCPT ); Wed, 23 Aug 2023 09:51:48 -0400 Received: from mail-yw1-x112e.google.com (mail-yw1-x112e.google.com [IPv6:2607:f8b0:4864:20::112e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE767CFE for ; Wed, 23 Aug 2023 06:51:46 -0700 (PDT) Received: by mail-yw1-x112e.google.com with SMTP id 00721157ae682-58fa51a0d97so48836497b3.3 for ; Wed, 23 Aug 2023 06:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798706; x=1693403506; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xEXFUFmf3inW/LN0OTx/vLWSMp4bAzU+io4MxvgVyuE=; b=yZRa1VExldTyg8Z3mUGmajHa0NzgI2RmO7/mSgUrK82FpwdfmaRWj3/4y1aDe7D9+Y 5H/sxOjIAlurKUz2onVyRVSaW2xtP8/VesChRYvLg65zTPerT58YF/HqHTOHWPf0hvjE g1NHGG17KsCCiXmpAJx9cKJkzYcKH9jDOaJSJ5e5Sz4ksIftKunRdErNMum6NmwqjwUd 8lHFFunl3XUPWn4av/kL3822N5yh9HKFB1EAkrEbyoOgGLRIfJlxNvv5OWFTa2XfA11w xkRcQle/bq2rZFfSZ8Fkt+oXoHNo011gt2q6W+TH1grC+8Y7Iyi3HCi35M/2NEGQ8goq p6OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798706; x=1693403506; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xEXFUFmf3inW/LN0OTx/vLWSMp4bAzU+io4MxvgVyuE=; b=Z6KBwD5fcSB6uQER5NK5pXKLQbVVdqcAGAcwlYfKqWRHco9+QScHs4L7KuVadsy5Dt D9qntLZFsxj0UHeLdrwg0nFvp1CDCj7T+oJSNQa/sjJBhcB056erPo8FGwCfyqWFzgW5 eBE9YKtI/N7vEjtWvlPgZyht8heKI74QSUFa9SbiX5utnVQeI7xVcjTCI53MOejkhNao UdLsjBqf3FT22oWNvyqxkVaFuWY+WvB+05QJHr5ZFPvK9Kkc3sIzWkCVe970OmV/trYS p0wGV/2XephEpnUtUEUd0UNAZuZ50hMXYKkSqdyusisukANsUGl5KxdHs+AgLBZykJ8x VlOA== X-Gm-Message-State: AOJu0YwJDQoDGAGrbqZrWfvSA/wo8vnEFT3BLpUPgCH9ljXB+LrFgCEA 600ptGjI2b7qcro8CiRBaB4o5EISoX/rT3drXfY= X-Google-Smtp-Source: AGHT+IHe22YdhvwYZIkGI8Y57uT5nSnz4FTvXF4pifOLgr2mKEtEOkh+FV6JnxikH+jM5paRGOg/Kg== X-Received: by 2002:a81:4e12:0:b0:586:a627:da2d with SMTP id c18-20020a814e12000000b00586a627da2dmr13065665ywb.9.1692798705918; Wed, 23 Aug 2023 06:51:45 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id l68-20020a0dc947000000b005772fc5912dsm3328063ywd.91.2023.08.23.06.51.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:45 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 01/11] btrfs: move btrfs_crc32c_final into free-space-cache.c Date: Wed, 23 Aug 2023 09:51:27 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org This is the only place this helper is used, take it out of ctree.h and move it into free-space-cache.c. Signed-off-by: Josef Bacik Reviewed-by: Anand Jain Reviewed-by: Johannes Thumshirn --- fs/btrfs/ctree.h | 5 ----- fs/btrfs/free-space-cache.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 9419f4e37a58..c80d9879d931 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -475,11 +475,6 @@ static inline u32 btrfs_crc32c(u32 crc, const void *address, unsigned length) return crc32c(crc, address, length); } -static inline void btrfs_crc32c_final(u32 crc, u8 *result) -{ - put_unaligned_le32(~crc, result); -} - static inline u64 btrfs_name_hash(const char *name, int len) { return crc32c((u32)~1, name, len); diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 27fad70451aa..759b92db35d7 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -57,6 +57,11 @@ static void bitmap_clear_bits(struct btrfs_free_space_ctl *ctl, struct btrfs_free_space *info, u64 offset, u64 bytes, bool update_stats); +static inline void btrfs_crc32c_final(u32 crc, u8 *result) +{ + put_unaligned_le32(~crc, result); +} + static void __btrfs_remove_free_space_cache(struct btrfs_free_space_ctl *ctl) { struct btrfs_free_space *info; From patchwork Wed Aug 23 13:51:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362577 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 C345BEE49A3 for ; Wed, 23 Aug 2023 13:51:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236309AbjHWNvu (ORCPT ); Wed, 23 Aug 2023 09:51:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236307AbjHWNvu (ORCPT ); Wed, 23 Aug 2023 09:51:50 -0400 Received: from mail-yw1-x1135.google.com (mail-yw1-x1135.google.com [IPv6:2607:f8b0:4864:20::1135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 425BD19A for ; Wed, 23 Aug 2023 06:51:48 -0700 (PDT) Received: by mail-yw1-x1135.google.com with SMTP id 00721157ae682-58dfe2d5b9aso76385027b3.1 for ; Wed, 23 Aug 2023 06:51:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798707; x=1693403507; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=WRjPotIUWEc4gJhIm2o/fQiRMm8MFzkSb3hRHYdvw3E=; b=EkGxrPrTUpbLQfySWBEtyNghWRRM7iTYXYqizR7QLYW55JCqYf4UQgdU6FVggia7/l mO9K9ckU/TtVsQOfvVQjhIKBTdmi8j7u9Rk1J+en2xkWggCmE0qs8ZPFALCUlihdjUSl OJqLZssO2u459ndp/XYdG6cwOuoWHZjXJYWVXhqW3LN/pWZ4D0O5xwZd4JwGXnYsKfra 3xcmL3R4MCxt06BOnJZcj2IjBdsC7RsTIwhftA0Owo+H3zNjD/bc3yGPR+N0uzFc4GcE lkijtiYdZTh+Ezg3nd+VFwRkXi9V/NoxiLCNoFUDICUwjEYNy1C3BFXdue9H3VGiZUj/ /iIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798707; x=1693403507; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WRjPotIUWEc4gJhIm2o/fQiRMm8MFzkSb3hRHYdvw3E=; b=lGV0CSX6DeCEutSaIgffTSNopbnzXjHpCHH4VfjT32QRv4bqyYo2Levxqx5/AqXRdO RAOcSmRSYgSYjKSeN9fd8kw3HaUV4JZeQKnHXHs2zTS2QS0fBlN+TMcDCrxd1hdUcxjW x80l+xfvpRJkllt1bpQhLOcruz5T/i3tj7fRbGSS7Rl8zz+rmSRAWLanNbjNZ2OogDut RNRY3MowVJu8Fw2WoIBed51aF78GZua9ONXHoU4U+wkh4Ib+14YYeGqxhbpasq6sl1gE sXPTqEAgMqEpplGnmBpHbCNm4FBVjeDE759NBHmiI1PrcRTcLmzWVM/IpWwhhnGIdkyR hdyg== X-Gm-Message-State: AOJu0YwIfCSJx737XVRbnxhQfhPoiqJ0AcFt5h9xbQQ2njMlXl9GY9pS NqKNDVAliOpFHGJTCKrqpGCB5dQLqTi1K1zfI6A= X-Google-Smtp-Source: AGHT+IHPOn4KkURcawhhKX3N8MXD+fWVfe6Z62NzFoX2+E0+tv8uDTz0oO/XsAti0nh5GxF62WhQOg== X-Received: by 2002:a0d:cc03:0:b0:56f:f83f:618 with SMTP id o3-20020a0dcc03000000b0056ff83f0618mr10829866ywd.19.1692798707346; Wed, 23 Aug 2023 06:51:47 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id p3-20020a0dff03000000b0055a07e36659sm556139ywf.145.2023.08.23.06.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:46 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 02/11] btrfs: remove btrfs_crc32c wrapper Date: Wed, 23 Aug 2023 09:51:28 -0400 Message-ID: <8a7ac9267cb726add7fb8bec90eb1d50ddbd0b4f.1692798556.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org This simply sends the same arguments into crc32c(), and is just used in a few places. Remove this wrapper and directly call crc32c() in these instances. Signed-off-by: Josef Bacik Reviewed-by: Anand Jain Reviewed-by: Johannes Thumshirn --- fs/btrfs/ctree.h | 5 ----- fs/btrfs/extent-tree.c | 6 +++--- fs/btrfs/free-space-cache.c | 4 ++-- fs/btrfs/send.c | 6 +++--- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index c80d9879d931..bffee2ab5783 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -470,11 +470,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info) #define BTRFS_BYTES_TO_BLKS(fs_info, bytes) \ ((bytes) >> (fs_info)->sectorsize_bits) -static inline u32 btrfs_crc32c(u32 crc, const void *address, unsigned length) -{ - return crc32c(crc, address, length); -} - static inline u64 btrfs_name_hash(const char *name, int len) { return crc32c((u32)~1, name, len); diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index f356f08b55cb..e4d337b78e76 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -399,11 +399,11 @@ u64 hash_extent_data_ref(u64 root_objectid, u64 owner, u64 offset) __le64 lenum; lenum = cpu_to_le64(root_objectid); - high_crc = btrfs_crc32c(high_crc, &lenum, sizeof(lenum)); + high_crc = crc32c(high_crc, &lenum, sizeof(lenum)); lenum = cpu_to_le64(owner); - low_crc = btrfs_crc32c(low_crc, &lenum, sizeof(lenum)); + low_crc = crc32c(low_crc, &lenum, sizeof(lenum)); lenum = cpu_to_le64(offset); - low_crc = btrfs_crc32c(low_crc, &lenum, sizeof(lenum)); + low_crc = crc32c(low_crc, &lenum, sizeof(lenum)); return ((u64)high_crc << 31) ^ (u64)low_crc; } diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 759b92db35d7..dfeed8256c02 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -545,7 +545,7 @@ static void io_ctl_set_crc(struct btrfs_io_ctl *io_ctl, int index) if (index == 0) offset = sizeof(u32) * io_ctl->num_pages; - crc = btrfs_crc32c(crc, io_ctl->orig + offset, PAGE_SIZE - offset); + crc = crc32c(crc, io_ctl->orig + offset, PAGE_SIZE - offset); btrfs_crc32c_final(crc, (u8 *)&crc); io_ctl_unmap_page(io_ctl); tmp = page_address(io_ctl->pages[0]); @@ -567,7 +567,7 @@ static int io_ctl_check_crc(struct btrfs_io_ctl *io_ctl, int index) val = *tmp; io_ctl_map_page(io_ctl, 0); - crc = btrfs_crc32c(crc, io_ctl->orig + offset, PAGE_SIZE - offset); + crc = crc32c(crc, io_ctl->orig + offset, PAGE_SIZE - offset); btrfs_crc32c_final(crc, (u8 *)&crc); if (val != crc) { btrfs_err_rl(io_ctl->fs_info, diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 3a566150c531..3b929f0e8f04 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -796,7 +796,7 @@ static int send_cmd(struct send_ctx *sctx) put_unaligned_le32(sctx->send_size - sizeof(*hdr), &hdr->len); put_unaligned_le32(0, &hdr->crc); - crc = btrfs_crc32c(0, (unsigned char *)sctx->send_buf, sctx->send_size); + crc = crc32c(0, (unsigned char *)sctx->send_buf, sctx->send_size); put_unaligned_le32(crc, &hdr->crc); ret = write_buf(sctx->send_filp, sctx->send_buf, sctx->send_size, @@ -5669,8 +5669,8 @@ static int send_encoded_extent(struct send_ctx *sctx, struct btrfs_path *path, hdr = (struct btrfs_cmd_header *)sctx->send_buf; hdr->len = cpu_to_le32(sctx->send_size + disk_num_bytes - sizeof(*hdr)); hdr->crc = 0; - crc = btrfs_crc32c(0, sctx->send_buf, sctx->send_size); - crc = btrfs_crc32c(crc, sctx->send_buf + data_offset, disk_num_bytes); + crc = crc32c(0, sctx->send_buf, sctx->send_size); + crc = crc32c(crc, sctx->send_buf + data_offset, disk_num_bytes); hdr->crc = cpu_to_le32(crc); ret = write_buf(sctx->send_filp, sctx->send_buf, sctx->send_size, From patchwork Wed Aug 23 13:51:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362578 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 4C369EE49B2 for ; Wed, 23 Aug 2023 13:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236311AbjHWNvw (ORCPT ); Wed, 23 Aug 2023 09:51:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236310AbjHWNvv (ORCPT ); Wed, 23 Aug 2023 09:51:51 -0400 Received: from mail-yw1-x1134.google.com (mail-yw1-x1134.google.com [IPv6:2607:f8b0:4864:20::1134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9533FCDF for ; Wed, 23 Aug 2023 06:51:49 -0700 (PDT) Received: by mail-yw1-x1134.google.com with SMTP id 00721157ae682-591ba8bd094so40129887b3.3 for ; Wed, 23 Aug 2023 06:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798708; x=1693403508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gDWUkrG4DZaGLhaxDYtKpgkyNYU+vRB0+Q/6VSj1VwU=; b=Td8E9NW5ij9mfzp9Jmxp23fkuy1lD/ZkpO3K2l7soH9yLrOoM4xoUVeqLcJVZX4w2T TDUPwfT6NQJKPCiTbegz9XBaU6CmoK4HM9fY2slb6Cn2mgbh/W3zQbamd61ciJa0i+mU NpwysaNuhXoQcPaGCO9/ga42xXyCt34T5Mx4PpsGQnHoFgWALziMUrKKj1nzO+zp6rkI +pPjIkAug1DIcZJrpZ+4obKx0Ehw6/cIk+3Ixi+YwVjOw69zx7uqiVUdgUQWeB5ddSNu 79ltJYxqlg4yJWePnQR84V+g7o0Hep27fy7Fv11O+9HTwilla66j748MrfFeYm9EWC4f bixw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798708; x=1693403508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gDWUkrG4DZaGLhaxDYtKpgkyNYU+vRB0+Q/6VSj1VwU=; b=APVSj7NGziG1QJK1MtvRgCWco4HGCNjbabgHqbZ/xSO+naWZmSVhhIZ1EAcFo+K/LQ 4PyWJZx4kzLJFDNekV7EJiOAOckXr7JyJ7hJ16aEIo8q0vRk0nkiQB3YeYPAHVw76xOG 2DlPoMsmFX2eMLvA4CZy+CtZ/tn8dGICYiH+II9nH/VicDjLelcQHX3Tai3Q7EkzwPjd Xs8JTKraS4UIcOeS5Oi70iZ1gDwMpQQRqttieyhd5WgIsb2sv0I12g7Hq/wUmr83OD8O biXbB1UrDl51Y43ggAcjW5bayr/rMHjrHlswjaMMauzLBARo2rgmTWC10P4BGCZiFBrw 0qCQ== X-Gm-Message-State: AOJu0Ywvz2WUnuXr4NKfquqG/MnRSuBj3D0B68Nolv2hqma62htciPaL UJJmy1iJpZgDCqhTYEBX5NGPIWP7dS8ohGljnxI= X-Google-Smtp-Source: AGHT+IGvDCY09fr0ofCXY3N3S/myQz3C79ytZU4OipEr7Gkf4ZkO5EPdGAIViwpZOJAanEDf3tD9HQ== X-Received: by 2002:a81:5cd4:0:b0:586:a141:3b3e with SMTP id q203-20020a815cd4000000b00586a1413b3emr13063149ywb.13.1692798708541; Wed, 23 Aug 2023 06:51:48 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id r6-20020a0de806000000b00586ba973bddsm3368066ywe.110.2023.08.23.06.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:48 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 03/11] btrfs: move btrfs_extref_hash into inode-item.h Date: Wed, 23 Aug 2023 09:51:29 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Ideally this would be un-inlined, but that is a cleanup for later. For now move this into inode-item.h, which is where the extref code lives. Signed-off-by: Josef Bacik Reviewed-by: Anand Jain Reviewed-by: Johannes Thumshirn --- fs/btrfs/ctree.h | 9 --------- fs/btrfs/inode-item.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index bffee2ab5783..7b8e52fd6d99 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -475,15 +475,6 @@ static inline u64 btrfs_name_hash(const char *name, int len) return crc32c((u32)~1, name, len); } -/* - * Figure the key offset of an extended inode ref - */ -static inline u64 btrfs_extref_hash(u64 parent_objectid, const char *name, - int len) -{ - return (u64) crc32c(parent_objectid, name, len); -} - static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping) { return mapping_gfp_constraint(mapping, ~__GFP_FS); diff --git a/fs/btrfs/inode-item.h b/fs/btrfs/inode-item.h index ede43b6c6559..2ee425a08e63 100644 --- a/fs/btrfs/inode-item.h +++ b/fs/btrfs/inode-item.h @@ -107,4 +107,13 @@ struct btrfs_inode_extref *btrfs_find_name_in_ext_backref( struct extent_buffer *leaf, int slot, u64 ref_objectid, const struct fscrypt_str *name); +/* + * Figure the key offset of an extended inode ref + */ +static inline u64 btrfs_extref_hash(u64 parent_objectid, const char *name, + int len) +{ + return (u64) crc32c(parent_objectid, name, len); +} + #endif From patchwork Wed Aug 23 13:51:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362579 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 DBCFEEE49B5 for ; Wed, 23 Aug 2023 13:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236312AbjHWNvw (ORCPT ); Wed, 23 Aug 2023 09:51:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234877AbjHWNvw (ORCPT ); Wed, 23 Aug 2023 09:51:52 -0400 Received: from mail-yw1-x1134.google.com (mail-yw1-x1134.google.com [IPv6:2607:f8b0:4864:20::1134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80BE319A for ; Wed, 23 Aug 2023 06:51:50 -0700 (PDT) Received: by mail-yw1-x1134.google.com with SMTP id 00721157ae682-58d40c2debeso61766857b3.2 for ; Wed, 23 Aug 2023 06:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798709; x=1693403509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fMEeV/ktXkiABS8UCZO8ADnW+e6o4cXxjPtsuMt8T9w=; b=oHEZ+/3FN51e9k+1d8gQGx60W4spyOGTmsBOWRCU3l0C1Ud160+5gJv5LS7UUNKHRj OGIIJ+IPauV7xRjjW2VkeSg+93HVVivJWscaUVPzjdck1i3eYkNv9pzHkkkzMBAqnJYB yCBuGQvyonrIf3+o3xzzVbG68PVS2vL9qRo1F1yg7/AxMJDYWt0x0iEjJJe20v8h7lG+ sIQxVDhQhDeVjnEl/7mQUliTjTldMhRpacxi+xTUGpgB1v3IvSmP61Jr3XVOA6OoyjV3 TU+MgFmZA0BZpHJ7H9Ga8ZzXTNX4ZNZjA0DZibzeu6rn6RiBE5ijCrDpRA8qP2Y/0bkh hIvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798709; x=1693403509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fMEeV/ktXkiABS8UCZO8ADnW+e6o4cXxjPtsuMt8T9w=; b=NtBWa8XtmsWG91n21+F1Jxo0uGgDhIwIKHyGQOyuxC27ig+rb4RxRD3C0uxHTq+vZa rOmLO5PoV51FizsRgHIEl7vS15dse49OhGYbrDSCUm2u6KiCB1PpZU3w4IdTWCb/IucK 1+uEI6gacaqA/37ghL/M6RahUgs7ZPAv7+nkXATl3fye4FnE4OdD37fxgTUMyuXE12KJ PpQ3TptcN611402KzTHpQAnwL0LLlS1jC4I8ToyGLepAemteIEKjx5thaTdd/JF0noEL PNtjSMeMc1F9VEIZLWhdW1NKT/k81UaHwqlTn3ZTvUVUfSQpr661gqf/m+PLgZa0Nk1Y WW5A== X-Gm-Message-State: AOJu0YxeXNbasGqoX3hMB7EZnoLdnpFFQ9JMoKsKk1ZbnZCkfpK68SUA I2DBbrPFpmFeBl/1+AWDwtNrSn+RyHBhEGfJskk= X-Google-Smtp-Source: AGHT+IHsYx1OgKjLzDt19MYn/Lawe0xmjSldzChdKLCNKNNRATbZm8xHqtbFo+e+xoFOeYwPQI1Hlg== X-Received: by 2002:a81:6ed6:0:b0:589:8b56:15f with SMTP id j205-20020a816ed6000000b005898b56015fmr13063587ywc.24.1692798709627; Wed, 23 Aug 2023 06:51:49 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id t123-20020a818381000000b0058e430889d5sm3365249ywf.10.2023.08.23.06.51.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:49 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 04/11] btrfs: move btrfs_name_hash to dir-item.h Date: Wed, 23 Aug 2023 09:51:30 -0400 Message-ID: <0739f7926fe01f0861a0f69da55f080fd7f464e4.1692798556.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org This is related to the name hashing for dir items, move it into dir-item.h. Signed-off-by: Josef Bacik Reviewed-by: Anand Jain Reviewed-by: Johannes Thumshirn --- fs/btrfs/ctree.h | 5 ----- fs/btrfs/dir-item.h | 5 +++++ fs/btrfs/props.c | 1 + fs/btrfs/tree-checker.c | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 7b8e52fd6d99..9c2e96b8711f 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -470,11 +470,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info) #define BTRFS_BYTES_TO_BLKS(fs_info, bytes) \ ((bytes) >> (fs_info)->sectorsize_bits) -static inline u64 btrfs_name_hash(const char *name, int len) -{ - return crc32c((u32)~1, name, len); -} - static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping) { return mapping_gfp_constraint(mapping, ~__GFP_FS); diff --git a/fs/btrfs/dir-item.h b/fs/btrfs/dir-item.h index aab4b7cc7fa0..951b4dda46fe 100644 --- a/fs/btrfs/dir-item.h +++ b/fs/btrfs/dir-item.h @@ -39,4 +39,9 @@ struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info, const char *name, int name_len); +static inline u64 btrfs_name_hash(const char *name, int len) +{ + return crc32c((u32)~1, name, len); +} + #endif diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c index 0755af0e53e3..f9bf591a0718 100644 --- a/fs/btrfs/props.c +++ b/fs/btrfs/props.c @@ -15,6 +15,7 @@ #include "fs.h" #include "accessors.h" #include "super.h" +#include "dir-item.h" #define BTRFS_PROP_HANDLERS_HT_BITS 8 static DEFINE_HASHTABLE(prop_handlers_ht, BTRFS_PROP_HANDLERS_HT_BITS); diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index ab08a0b01311..8ad92aa43924 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -29,6 +29,7 @@ #include "accessors.h" #include "file-item.h" #include "inode-item.h" +#include "dir-item.h" /* * Error message should follow the following format: From patchwork Wed Aug 23 13:51:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362580 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 C1968EE4993 for ; Wed, 23 Aug 2023 13:51:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236316AbjHWNv6 (ORCPT ); Wed, 23 Aug 2023 09:51:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231879AbjHWNv5 (ORCPT ); Wed, 23 Aug 2023 09:51:57 -0400 Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1D8FCDF for ; Wed, 23 Aug 2023 06:51:51 -0700 (PDT) Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-d678b44d1f3so7609519276.0 for ; Wed, 23 Aug 2023 06:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798711; x=1693403511; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PMcUOKqHe+PHMcuwbh3TXRzBI0wToWNfG4w5HBgGNA8=; b=dCOtaFh5Fz2u+rr8A7gsPSQc5mI1wFkniQb21t2qWgg1ekmxRI1cdJN3RgjM0LoYxa 2Wjcnt8szxkuOTf+7252IGqlhtGx9982WJPlaVPST9weQhzmOBqNdp5pHb2iz28WIdiG m8TYvELorB1p453FyJEhgjrJNVyjyoEBSpctUhZlMmwLgHDdCoQg1d8SYN18uwl4gvv5 6zgn3ashz1zskOm02nKn11rQxSIXIvqz45NZBLpatBWzVrYIhQzCt/LMWwlHgqvBB6iv B7xZO0LuNEC6n/IjetsJgSOV4J2fnBLJX4AJPVjAxsU68Ta+wlplcl9Y4kRWg3faKGun UX3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798711; x=1693403511; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PMcUOKqHe+PHMcuwbh3TXRzBI0wToWNfG4w5HBgGNA8=; b=IB+GiNyLckMYyfE7DeZSNKq4Vwl4wulVqVbJ1FjBg//oyS2k43zX9Q2QqPTQAvXIQ9 0AJ11nZShCXSAHKl8QREhJWyznRQ988CxGZrdc2C3C10B95Sqbdi7YD8fAY+vKkX1IA6 RiDfJyvgxn14x7EgddyA+Ee3Dnby+5x6X+l5li7Gg5Nb0tiZecQNBxQe4ODMXPAhOexQ liI3AjyMhY2+mS6mC906ggRCduS33/FnJVlUf1Vh65btr/GX9/5tezv1WOur6+4M3Ig+ QSCFbc6hX44mbNBxI1/mICK1eYL5p/IlQqxpAoMaIeR8IbPnYS0iu5GJ7S9VgxnyJ1ez DuJA== X-Gm-Message-State: AOJu0YyzXNHq2+j9wFOIjAVPhoQLf73BCMJlCTsOxs257OtU/nRA1Yga jtSxY3r6H9iijBndVrhJLQAYiZnSlhoVo2n83d4= X-Google-Smtp-Source: AGHT+IGaJgDlkKBs4mJ+Vl4xf1tgAI/+v7e5AaDvAK5/XDXn9rgGTcMcGBWgF0QcOYVPp+btoiLhwA== X-Received: by 2002:a25:f81b:0:b0:d4b:f497:c869 with SMTP id u27-20020a25f81b000000b00d4bf497c869mr11175150ybd.8.1692798711017; Wed, 23 Aug 2023 06:51:51 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id v22-20020a814816000000b005922c29c025sm1348879ywa.108.2023.08.23.06.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:50 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 05/11] btrfs: include asm/unaligned.h in accessors.h Date: Wed, 23 Aug 2023 09:51:31 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org We use the unaligned helpers directly in accessors.h, add the include here. Signed-off-by: Josef Bacik Reviewed-by: Johannes Thumshirn --- fs/btrfs/accessors.h | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/btrfs/accessors.h b/fs/btrfs/accessors.h index 8cfc8214109c..f958eccff477 100644 --- a/fs/btrfs/accessors.h +++ b/fs/btrfs/accessors.h @@ -4,6 +4,7 @@ #define BTRFS_ACCESSORS_H #include +#include struct btrfs_map_token { struct extent_buffer *eb; From patchwork Wed Aug 23 13:51:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362581 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 BE585EE49A3 for ; Wed, 23 Aug 2023 13:51:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236319AbjHWNv6 (ORCPT ); Wed, 23 Aug 2023 09:51:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234877AbjHWNv5 (ORCPT ); Wed, 23 Aug 2023 09:51:57 -0400 Received: from mail-yw1-x112f.google.com (mail-yw1-x112f.google.com [IPv6:2607:f8b0:4864:20::112f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25DD219A for ; Wed, 23 Aug 2023 06:51:53 -0700 (PDT) Received: by mail-yw1-x112f.google.com with SMTP id 00721157ae682-58c92a2c52dso61309227b3.2 for ; Wed, 23 Aug 2023 06:51:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798712; x=1693403512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=sC8vKC1MdrtQTH/KdS7qPHtYBd4gWs5JdzeemEzBpyc=; b=lyZbpx4d6yDwETU2iyYvMdwbKeTJWGOe0P5dSC2lWDvzrHGl6Gji4xQbbnuDkrFFzn oUe6/SUqnUh94Mb0+mi5c7WbwfbgNs5WQNfv/J/jyALFHne45QMe2CqJRNrYTR6wWTlH qNU+yDsMPEqX2/lyabXJG1F+QXNcvHr+KOZsedNDhHEUiXnuCXiPOvZaZOJiq68D/wy0 fOkY3QxvAymJlU3p0UlofyIUx/etpVVpEvLYK2BqggdoYIFA6x1fXdrr7hGrFypTyQhZ bi1EYuAn69JNFy1EVW6B+1voOGuawM4S4TRnld7Pa1EAEOJR6oBvLAvVXXq3GUAvRMju SJsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798712; x=1693403512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sC8vKC1MdrtQTH/KdS7qPHtYBd4gWs5JdzeemEzBpyc=; b=Sfc3JrAO3LLn1YSAM69YuSvy5QetDjQN+HV2JSAHQdGRXPH2ghB6KEJnsaxo5UinMn t/DoWTQ+ExApx0lVGPD0Jsxz/qZpxiCKYksRM8+gKnbCdvsXvrszhNH30VuObv7cuIc+ PinZP/DXlPMS8o92mk6OnnjyEjNIe3VffiGzSPCpV4GxBNXgeUGWhXnH5j/+MfccPZDE buLF+mNP2fCRZjm/q5VkMGopfc8HBaJOCWMhvHJP8AmFQwwFV/3PqwBmzp2cnR4ntwfM n+XUtkym7zJBrhM2SJqt3bzB0TmBKEXG+5mcFq1R5IOPTI6mLuTRKzWmrR0TyA7DjXVG ZgTg== X-Gm-Message-State: AOJu0YwuUm/CmOXmwBG8yHW6X0M1i1Xj4EPdGyKrWSbbJOeEpb5WAVwZ IOYGX2DQ6wdqvsZE1gs1x4m+L+VdxVbiE3P6GIs= X-Google-Smtp-Source: AGHT+IFpBj8vuy/6TuNaHN+tJoAAIrr2CgysN0ypqFrRJLg9fBX5Hwr5FrIPgmSWujKRmiNahJOgeA== X-Received: by 2002:a0d:ea95:0:b0:579:f163:dc2f with SMTP id t143-20020a0dea95000000b00579f163dc2fmr13207236ywe.3.1692798712244; Wed, 23 Aug 2023 06:51:52 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id g191-20020a8152c8000000b005840bd271c5sm3317325ywb.100.2023.08.23.06.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:51 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 06/11] btrfs: include linux/crc32c in dir-item and inode-item Date: Wed, 23 Aug 2023 09:51:32 -0400 Message-ID: <6dbf325458ee1c2fc45a66779fd5a277d4f39810.1692798556.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Now these are holding the crc32c wrappers, add the required include so that we have our necessary dependencies. Signed-off-by: Josef Bacik Reviewed-by: Anand Jain --- fs/btrfs/dir-item.h | 2 ++ fs/btrfs/inode-item.h | 1 + 2 files changed, 3 insertions(+) diff --git a/fs/btrfs/dir-item.h b/fs/btrfs/dir-item.h index 951b4dda46fe..5db2ea0dfd76 100644 --- a/fs/btrfs/dir-item.h +++ b/fs/btrfs/dir-item.h @@ -3,6 +3,8 @@ #ifndef BTRFS_DIR_ITEM_H #define BTRFS_DIR_ITEM_H +#include + int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, const struct fscrypt_str *name); int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, diff --git a/fs/btrfs/inode-item.h b/fs/btrfs/inode-item.h index 2ee425a08e63..63dfd227e7ce 100644 --- a/fs/btrfs/inode-item.h +++ b/fs/btrfs/inode-item.h @@ -4,6 +4,7 @@ #define BTRFS_INODE_ITEM_H #include +#include struct btrfs_trans_handle; struct btrfs_root; From patchwork Wed Aug 23 13:51:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362582 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 68BC3EE49B2 for ; Wed, 23 Aug 2023 13:51:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236195AbjHWNv7 (ORCPT ); Wed, 23 Aug 2023 09:51:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236313AbjHWNv5 (ORCPT ); Wed, 23 Aug 2023 09:51:57 -0400 Received: from mail-yb1-xb30.google.com (mail-yb1-xb30.google.com [IPv6:2607:f8b0:4864:20::b30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36C39CEC for ; Wed, 23 Aug 2023 06:51:54 -0700 (PDT) Received: by mail-yb1-xb30.google.com with SMTP id 3f1490d57ef6-d678b44d1f3so7609562276.0 for ; Wed, 23 Aug 2023 06:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798713; x=1693403513; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=KXhfugQ15ZQIBw/K62Nj9pa/gM6xIJGR9HpfEvZp4TU=; b=W6ofK/RK60tkE5I29jonFZK1oQ11FYWBdtN58Xz0G9r06sUuPa7QGiW4jzQ85XZMeZ d17eJ00kQW9aHKDWAimmGAbwxx3m2imU+6SfEPlawQ1yzGdSnXQMQniZzBBAvq6ta65j 2hmhTofZMTdGuLpU/dNny93jrW0FK/PCm04fwApy36jfecqLVz97yp6+PpiYkwNyV+lR oSm2srSVd7Du0fp4M2ZiQ97/qCvfbnLVns2bG9sgV9IEIhMWkrJT4L71Hb+iw1Y/Me1c NHDGekH/33tSeZhfjffanxOiCQcH3HAUVcF5rjIcBgdyWMFtc+GqmgnQauDFDFH1/5jZ qaBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798713; x=1693403513; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KXhfugQ15ZQIBw/K62Nj9pa/gM6xIJGR9HpfEvZp4TU=; b=Hh8C5A3m4Ep8Z6pdj1xBQhiJvqe5skxH9m5O7sxs66sUd090OX8pwf79OU39u8c70R oec92mLp2/OWIq/Su6Kesc9b22dHaerAtoNUFa+aS1hk7q5zFzl4yMY+OhMP7hcBpX3I d9a/rPhir3yi7R+KP4IxftJIwQr8zuIkJGdrBvQ99vLN9CFRCAmMJnm/s9Y0d03f5K/E BcB3UpRvDDixo/nZGtPCFnzDct8aOyENFJx4sAkszG3H0nP1imxEckA67RfZX7kD1u2D /onQUxEx7YMVoKhIHOIdgWAXI0WXzy8AdBG7Zuf2yYPw5R4GH+2j0sZE/3QAuQEU2VyZ jvNw== X-Gm-Message-State: AOJu0Yx5ArETATl21wjYfV1geIQzNtN+u/ap4Tl9ZoPjiyz0WwsQpqqh 1BR/TJe+3oR/W4zv6yPc8zQrPfyY4eYt/JmWf4E= X-Google-Smtp-Source: AGHT+IG01GHTeCnuxuj+b1h3msV0qIfTuv5Ipff6OYebo2FUvXPZhgRuV/pucDEx9jlPbKIJc1g4LQ== X-Received: by 2002:a25:2d02:0:b0:d07:4e50:392c with SMTP id t2-20020a252d02000000b00d074e50392cmr12580996ybt.13.1692798713356; Wed, 23 Aug 2023 06:51:53 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id w7-20020a25ac07000000b00d77928cdcf6sm693011ybi.15.2023.08.23.06.51.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:53 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 07/11] btrfs: include linux/iomap.h in file.c Date: Wed, 23 Aug 2023 09:51:33 -0400 Message-ID: <1dc135f94f5432b2c2264eda691787a3300ebea6.1692798556.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org We use the iomap code in file.c, include it so we have our dependencies. Signed-off-by: Josef Bacik Reviewed-by: Johannes Thumshirn --- fs/btrfs/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 6edad7b9a5d3..ee9621e622d0 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "ctree.h" #include "disk-io.h" #include "transaction.h" From patchwork Wed Aug 23 13:51:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362583 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 73E08EE49B0 for ; Wed, 23 Aug 2023 13:52:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236322AbjHWNwA (ORCPT ); Wed, 23 Aug 2023 09:52:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236317AbjHWNv6 (ORCPT ); Wed, 23 Aug 2023 09:51:58 -0400 Received: from mail-yw1-x1129.google.com (mail-yw1-x1129.google.com [IPv6:2607:f8b0:4864:20::1129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EFCDCEF for ; Wed, 23 Aug 2023 06:51:55 -0700 (PDT) Received: by mail-yw1-x1129.google.com with SMTP id 00721157ae682-58df8cab1f2so59967347b3.3 for ; Wed, 23 Aug 2023 06:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798714; x=1693403514; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=359EXyjrgYnw0qy+pnTckUd50Ihk3THkdm2GNkP0MAk=; b=Lh9t+4oX7XobQVBr6rIMKJKIBcFPvPRyBg4YN3qVUSU6gAQkwl/jYCyxtWDPB3aVfZ 9e75SZXxebIXjzL5Xaa89DNWmfJxByL1DVtcTW2VOXxp3o974Af/fZuM0v1XIsmg9gPG WcKAsPZwDHTriGxEwWxF9CP92ltWtHMjUhaCrtoRlkXk2Lex+MBTVA2R1uIZkt/2czX8 9ImVFlnybOModT0znrCPat6kyTTa2iqTpEwPlVLq8g68nqN8WpVyuHx5E8u9MPINU/+W VMmGRLxr0eHtIMUsL9auDlGgx6F9YywiY3AbvmHqD7rwFZwTuEgvqHZaJF0kTzHTl+tl sg+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798714; x=1693403514; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=359EXyjrgYnw0qy+pnTckUd50Ihk3THkdm2GNkP0MAk=; b=Ugi8f44VKU5cZdyfX9wzYHZ1knv2Is/0mNu2kd4uvq8tZPH+z8baPyaLEi6m+x0E8T sAXExZenlW8zIaYKpRiJLZP+yyzIGitti1+yc8xBaLsdnrS2PXv4wrgVf0ldlPZYuR1o asAtntbah05A05M93bF5ZjHR+gDswGqul2zJgSqKGwHBYg4du3eS4w/wNr1PR+aGCjE6 wLvM5a8Ed13dmIQhEoJ9ZM0fK8tbncOF3yuBl529XG5i6m/qi6bS9T3/GxyJ5t4BvFGa wsrxfevV/E48JRMa9f4q26CaL8oZMlCvx0FtuPLl7JVK5LToPvwB9ei5GLC3n/Hq7lv7 KGAQ== X-Gm-Message-State: AOJu0Yzo/IxtPDXTpQmEKgHLs9CeN+SRuanVqBI3yF+qZZjEctg7gwdn eHhkm78QkC/Nh3caqTR0ZRSi9lM3OrOrWUhSdeo= X-Google-Smtp-Source: AGHT+IF4W2RVplZ2HIOC9OqkdNcx+bNUXa2dwAJoIZbfAaW5U6wS0BaPlcSzdfA6+Vg70Mmm/WDg8Q== X-Received: by 2002:a0d:cec7:0:b0:573:d3cd:3d2a with SMTP id q190-20020a0dcec7000000b00573d3cd3d2amr12096743ywd.28.1692798714545; Wed, 23 Aug 2023 06:51:54 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id h185-20020a0dc5c2000000b0058427045833sm3389431ywd.133.2023.08.23.06.51.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:54 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 08/11] btrfs: add fscrypt related dependencies to respective headers Date: Wed, 23 Aug 2023 09:51:34 -0400 Message-ID: <51e817ceddd3f694740c7fcc6f9dbe7f2d720fbe.1692798556.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org These headers have struct fscrypt_str as function arguments, so add struct fscrypt_str to the theader, and include linux/fscrypt.h in btrfs_inode.h as it also needs the definition of struct fscrypt_name for the new inode args. Signed-off-by: Josef Bacik Reviewed-by: Johannes Thumshirn --- fs/btrfs/btrfs_inode.h | 1 + fs/btrfs/dir-item.h | 2 ++ fs/btrfs/inode-item.h | 1 + fs/btrfs/root-tree.h | 2 ++ 4 files changed, 6 insertions(+) diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index bda1fdbba666..bca97a6bb246 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -8,6 +8,7 @@ #include #include +#include #include "extent_map.h" #include "extent_io.h" #include "ordered-data.h" diff --git a/fs/btrfs/dir-item.h b/fs/btrfs/dir-item.h index 5db2ea0dfd76..e40a226373d7 100644 --- a/fs/btrfs/dir-item.h +++ b/fs/btrfs/dir-item.h @@ -5,6 +5,8 @@ #include +struct fscrypt_str; + int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, const struct fscrypt_str *name); int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, diff --git a/fs/btrfs/inode-item.h b/fs/btrfs/inode-item.h index 63dfd227e7ce..a4a142f1b5e3 100644 --- a/fs/btrfs/inode-item.h +++ b/fs/btrfs/inode-item.h @@ -13,6 +13,7 @@ struct btrfs_key; struct btrfs_inode_extref; struct btrfs_inode; struct extent_buffer; +struct fscrypt_str; /* * Return this if we need to call truncate_block for the last bit of the diff --git a/fs/btrfs/root-tree.h b/fs/btrfs/root-tree.h index cbbaca32126e..eb15768b9170 100644 --- a/fs/btrfs/root-tree.h +++ b/fs/btrfs/root-tree.h @@ -3,6 +3,8 @@ #ifndef BTRFS_ROOT_TREE_H #define BTRFS_ROOT_TREE_H +struct fscrypt_str; + int btrfs_subvolume_reserve_metadata(struct btrfs_root *root, struct btrfs_block_rsv *rsv, int nitems, bool use_global_rsv); From patchwork Wed Aug 23 13:51:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362584 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 189EEEE4993 for ; Wed, 23 Aug 2023 13:52:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236325AbjHWNwB (ORCPT ); Wed, 23 Aug 2023 09:52:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236318AbjHWNv6 (ORCPT ); Wed, 23 Aug 2023 09:51:58 -0400 Received: from mail-ua1-x933.google.com (mail-ua1-x933.google.com [IPv6:2607:f8b0:4864:20::933]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2598CDF for ; Wed, 23 Aug 2023 06:51:56 -0700 (PDT) Received: by mail-ua1-x933.google.com with SMTP id a1e0cc1a2514c-78a5384a5daso1597097241.0 for ; Wed, 23 Aug 2023 06:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798716; x=1693403516; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=t6AEW6ge5cEyzzzVA9dkAUL4qwB1kcQfIvwbaN5wWw4=; b=GN0R8VEI8hWM0GZ1qcW3DbpbmjAh2OY9+uuzrqHPwmvqFfL1mE9b9xw+Z+1+ClaA1k xR5N1RxFq4hFteuVes1vthM9X0hI6WTBepZAf0SI2ZkOdTCG6K0cDr8K2JWj9uCyYggC K+OHIOTkOhlj55H/WLY57rGREKFiyt/xAYI5dnk9RdQSa8+ZU2LCSu3+yAOwYTAjxlJG kQUKtK9bLgLMl3L/GPfJZ1xM48d6+In48gWJ5uP92QLOAXou3HPksn9N7UFNEguTL0mJ hzpN4Q30MYPwLBi1mndf8oG3rywuhon6291d4c1u9s1mRaWlOt3rXgEEXgyl6EBLwcL7 nKLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798716; x=1693403516; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t6AEW6ge5cEyzzzVA9dkAUL4qwB1kcQfIvwbaN5wWw4=; b=Ak+RM90c24PwkwBeEF7Wu78Ffz9gj7a2eQE5I1VvA2P6tEKtC+95dP+AvMzugs1O7z hvVpuNMtNAs6FFGbWRj3DbBrssrUNStkGXElub3Iqu6yBO+QZrMVixQZKESYGzlhJUz4 gB8o8/5wKS07uyx1q92iasEnXQxm/henV/7VaY/60dBYQb8QzLJspT169aabEv7G9L6P Y3ieQpg6N5TX/htcnL9w+p5lAwLGbo7JJJWh4/ik/qNdvFpjEFHrowZM5mDzKezWYo6+ E6o0Sb9YmufWMp91z2XP3+w9k7Z13hdR4I8IutNJUQvcVEiVnkGgYwuHuGbEpXKJwMkG ExAg== X-Gm-Message-State: AOJu0YyCh0Z0MPbLnFfHQqP7WIhJeBK9PbF1XqN5W58cXQuYM0uNqnRZ u/zOpcVnbyZHdmQJ/JRPl4dG0ThKfUQ4ovS6YDs= X-Google-Smtp-Source: AGHT+IFKMRjbRNISU3pkHSGCactWIZi09EFRkuNNWjVpgKFNC86Hr0kuYWwbwsQ85zCDL7dvY5H5SA== X-Received: by 2002:a67:f4c2:0:b0:443:ef68:1f07 with SMTP id s2-20020a67f4c2000000b00443ef681f07mr7597769vsn.2.1692798715825; Wed, 23 Aug 2023 06:51:55 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id 10-20020a25030a000000b00c5ec980da48sm2843864ybd.9.2023.08.23.06.51.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:55 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 09/11] btrfs: add btrfs_delayed_ref_head declaration to extent-tree.h Date: Wed, 23 Aug 2023 09:51:35 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org extent-tree.h uses btrfs_delayed_ref_head in a function argument but doesn't pull it's declaration from anywhere, add it to the top of the header. Signed-off-by: Josef Bacik Reviewed-by: Johannes Thumshirn --- fs/btrfs/extent-tree.h | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/btrfs/extent-tree.h b/fs/btrfs/extent-tree.h index 88c249c37516..ab2016db17e8 100644 --- a/fs/btrfs/extent-tree.h +++ b/fs/btrfs/extent-tree.h @@ -7,6 +7,7 @@ #include "block-group.h" struct btrfs_free_cluster; +struct btrfs_delayed_ref_head; enum btrfs_extent_allocation_policy { BTRFS_EXTENT_ALLOC_CLUSTERED, From patchwork Wed Aug 23 13:51:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362585 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 8C3F6EE49B5 for ; Wed, 23 Aug 2023 13:52:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236326AbjHWNwB (ORCPT ); Wed, 23 Aug 2023 09:52:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236320AbjHWNv7 (ORCPT ); Wed, 23 Aug 2023 09:51:59 -0400 Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C51019A for ; Wed, 23 Aug 2023 06:51:58 -0700 (PDT) Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-d45caf42d73so5399542276.2 for ; Wed, 23 Aug 2023 06:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798717; x=1693403517; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DHBFOgE5uZyoUbpVEvQ3beNIaqF+ekj1i5xCHWJaTCQ=; b=yY6fbcHPAJwP2KBDDlb40/F4wRBOunxF8XTnWtDYy4SzaUKRCdSrRgiArkRFzDAnYR OXsptHxjUjhiqGL+Oq4LlMTUHsqapVB19k7P7Kti4m87/51G+SZDrzejH+MEGepYE775 RJxN57LJdTaq5+YytjeVLpYTl0nMywwhbCCdhxlkDNCRlVZwr3DgNFwODArc3OeMVhi9 IBsu/IWCnL8cct3e8yi9vfh9hkfC//in8isu2u8PaKqx7vbwY3DryhJDHypeRbSQxgY+ ZOkbtNwndixBbrXpIclVdJkqMdOijIlLZV1y6wTly3xJnmY2OXvmjoW8B7QmxR82vJk6 hVHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798717; x=1693403517; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DHBFOgE5uZyoUbpVEvQ3beNIaqF+ekj1i5xCHWJaTCQ=; b=B5Zej1WsWa4vZLDuDQoNhBYjSlxN/KitCy02/9wljwimqB/dyBYIC6DdbQGpmXJCYx hgdT35mvfeBF/ipSA3QikImEWOZytnHcVw0evEJBL6p+6Cw71aBE9RFvKHgM6HiVfvIr 7H2zoPdku8ciHYJhB1wWVp3FO/wX3zogZ01xDFGm/i6dIHECImoyjr4x3IhZLsHqKBn1 GzRzFbILAfbmz+6XD3TIGTXAkXvZfzujSd0lSeTSOL8bkaluZguJjCX1zab4vhGzr/k4 UXBZBTPqDVjhG2Z/pnu4d0OnnRBCK0SuCSLpcqtIvwvrNs8ztAe1YQkOUXDYBw78+Ja/ nkaw== X-Gm-Message-State: AOJu0YyVxJidG84EyPaTSIgP4lDtVT7Wafq24NIJXGwGNu40nj6K10+a G3RGtADFQ6n9+4UOVpVt/ljjkcHKiWV+ITawEbg= X-Google-Smtp-Source: AGHT+IGDDN2u/VWlhjSowVDGOI804YpMd/e1Pczn/NhgMjXos/JwrxE5iYMDW8DbjShEicUs2FIFLQ== X-Received: by 2002:a25:d752:0:b0:d77:d6e5:410a with SMTP id o79-20020a25d752000000b00d77d6e5410amr1179451ybg.51.1692798717232; Wed, 23 Aug 2023 06:51:57 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id 203-20020a2501d4000000b00d4fc4132653sm2835226ybb.11.2023.08.23.06.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:56 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 10/11] btrfs: include trace header in where necessary Date: Wed, 23 Aug 2023 09:51:36 -0400 Message-ID: <59f02409baa3a41239ff61c3cf4c62b2a26501b9.1692798556.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org If we no longer include the tracepoints from ctree.h we fail to compile because we have the dependency in some of the header files and source files. Add the include where we have these dependencies to allow us to remove the include from ctree.h. Signed-off-by: Josef Bacik Reviewed-by: Johannes Thumshirn --- fs/btrfs/async-thread.c | 1 + fs/btrfs/btrfs_inode.h | 1 + fs/btrfs/locking.c | 1 + fs/btrfs/space-info.h | 1 + 4 files changed, 4 insertions(+) diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c index ce083e99ef68..714ca74b66bf 100644 --- a/fs/btrfs/async-thread.c +++ b/fs/btrfs/async-thread.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "async-thread.h" #include "ctree.h" diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index bca97a6bb246..b675dc09845d 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -9,6 +9,7 @@ #include #include #include +#include #include "extent_map.h" #include "extent_io.h" #include "ordered-data.h" diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c index 7979449a58d6..79a125c0f4a2 100644 --- a/fs/btrfs/locking.c +++ b/fs/btrfs/locking.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "misc.h" #include "ctree.h" #include "extent_io.h" diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h index 0bb9d14e60a8..ac0ce83f1477 100644 --- a/fs/btrfs/space-info.h +++ b/fs/btrfs/space-info.h @@ -3,6 +3,7 @@ #ifndef BTRFS_SPACE_INFO_H #define BTRFS_SPACE_INFO_H +#include #include "volumes.h" /* From patchwork Wed Aug 23 13:51:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13362586 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 3A123EE49A3 for ; Wed, 23 Aug 2023 13:52:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236327AbjHWNwC (ORCPT ); Wed, 23 Aug 2023 09:52:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236317AbjHWNwB (ORCPT ); Wed, 23 Aug 2023 09:52:01 -0400 Received: from mail-yw1-x1129.google.com (mail-yw1-x1129.google.com [IPv6:2607:f8b0:4864:20::1129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80B7E19A for ; Wed, 23 Aug 2023 06:51:59 -0700 (PDT) Received: by mail-yw1-x1129.google.com with SMTP id 00721157ae682-58d9ba95c78so63150037b3.1 for ; Wed, 23 Aug 2023 06:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20221208.gappssmtp.com; s=20221208; t=1692798718; x=1693403518; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=elHUiU95JNtc+7/kD21797AHjWx8kuHextAOLQG/DnA=; b=LBTeAN2l3SSvtfK0YabZkc+f11QzD+pBGrTnhT0lRu4uCpAek2rgWrNgQn2gs5RMoJ lEJen6RRG66PNtBVC7DH1G8PDfULJAK/LnDCuGbXygji8P5ApEvzzaK0c3UBW4UMbpXO 6h78+2+wJX7CDT74U9F6MxBY7Quq/rYOaRYDJ3Hg1nbSWocIen+A0AI0hX8zn3hRnntA dwahm8Tc95ujiLWll7XCXQuOnQrTDiRVIB3MefhO3/I+rmCEfk0T9e5KBkYfWWknNTVJ r0a9kydYFYI7YHLNgym7VuUMD8c3Neaov7xIGxbk7/tLXf5f4rOLTafODXcL4go2Z5om C28g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692798718; x=1693403518; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=elHUiU95JNtc+7/kD21797AHjWx8kuHextAOLQG/DnA=; b=Wsu7g/ImWr7OgMqOG4JJ1mxt8Ctrfjys0P4jig8mvbKY20ksP262SMGLMOIrJbBjJn /n3QNCqaawIOSZ7v02VEtYS1u7eDKwCBe9s1bhzfJczFowbjrRpJuIu/yj5k6SX9OajL 1bEq4XJWBd6eTPtQO/kIGDrMxJhErfdiM8Rf8jMFKHZ/YJ180iqiU+ho/RNBTbLG6Z3L LqjnYrFnFep0WCA/zCwHoeIll18w7J27vShS5L9zZcW1tGMw836DOwsAyYRafgMCK6Ui Bqja213GAPPUH+6k9a/UoNoHx7RmhFIpk1xjb8DMlF/sBU/5e9oyKmaGK1r0FJ8h1wm2 1knA== X-Gm-Message-State: AOJu0YxQRRYBSl4WCBq91CtD4cxHlyAdq6Pl7BVtoEhdaNgQZMeaoXtn s1z/ma07vLxmu10i4Cl4Wp7QWSCIxB4dhsWCk/I= X-Google-Smtp-Source: AGHT+IHR/QNHN95CAlsnt0Rt6K90JYVYz3uLl30DFD0QKUhOtT8N+ZVl2OdFW3hnGLH4KGNrYwoOfQ== X-Received: by 2002:a0d:c641:0:b0:592:608b:b9f7 with SMTP id i62-20020a0dc641000000b00592608bb9f7mr1948303ywd.35.1692798718494; Wed, 23 Aug 2023 06:51:58 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id h126-20020a0dde84000000b0058038e6609csm3359237ywe.74.2023.08.23.06.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 06:51:58 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 11/11] btrfs: remove extraneous includes from ctree.h Date: Wed, 23 Aug 2023 09:51:37 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org We don't need any of these includes in the ctree.h header file for the header file itself, remove them to clean up ctree.h a little bit. Signed-off-by: Josef Bacik --- fs/btrfs/ctree.h | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 9c2e96b8711f..da9e07bf76ea 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -6,36 +6,8 @@ #ifndef BTRFS_CTREE_H #define BTRFS_CTREE_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "extent-io-tree.h" -#include "extent_io.h" -#include "extent_map.h" -#include "async-thread.h" -#include "block-rsv.h" #include "locking.h" -#include "misc.h" #include "fs.h" struct btrfs_trans_handle;