From patchwork Wed Jun 24 16:03:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 1316357 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=nic.cz header.i=@nic.cz header.a=rsa-sha256 header.s=default header.b=cV8QrnD2; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 49sSjB3hdmz9sSc for ; Thu, 25 Jun 2020 02:07:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8AB24820A5; Wed, 24 Jun 2020 18:05:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=nic.cz header.i=@nic.cz header.b="cV8QrnD2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1A31F820C5; Wed, 24 Jun 2020 18:04:08 +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=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail.nic.cz (mail.nic.cz [IPv6:2001:1488:800:400::400]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7C2B4820A4 for ; Wed, 24 Jun 2020 18:03:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marek.behun@nic.cz Received: from dellmb.labs.office.nic.cz (unknown [IPv6:2001:1488:fffe:6:cac7:3539:7f1f:463]) by mail.nic.cz (Postfix) with ESMTP id 2F4121409E5; Wed, 24 Jun 2020 18:03:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1593014605; bh=AapOGgBQ7fnDzrATd4tl0bUbbbk7nghQbf4nY6twS4Y=; h=From:To:Date; b=cV8QrnD2jrbyFeu2gmcDS0b+mTgEmyI3HcJI5Z5LSMR+JqbmnUAOiKn7RKbiQrXO8 jZenzhFoTlNDQAwaxPaeAI7aO+oS0wymqSt+5JPOWxFISrzNPpK7JP0NwMUx+CY390 WwDTH4Vkp7UWc6fB77A+8WQ+8x024ieOcmWX5IMY= From: =?utf-8?q?Marek_Beh=C3=BAn?= To: u-boot@lists.denx.de Cc: =?utf-8?q?Alberto_S=C3=A1nchez_Molero?= , Marek Vasut , Pierre Bourdon , Simon Glass , Tom Rini , Yevgeny Popovych , linux-btrfs@vger.kernel.org, Qu Wenruo , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH U-BOOT v3 22/30] fs: btrfs: Rename btrfs_file_read() and its callees to avoid name conflicts Date: Wed, 24 Jun 2020 18:03:08 +0200 Message-Id: <20200624160316.5001-23-marek.behun@nic.cz> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200624160316.5001-1-marek.behun@nic.cz> References: <20200624160316.5001-1-marek.behun@nic.cz> MIME-Version: 1.0 X-Spamd-Bar: / X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean From: Qu Wenruo Rename btrfs_file_read() and its callees to avoid name conflicts with the incoming new code. Signed-off-by: Qu Wenruo Reviewed-by: Marek Behún --- fs/btrfs/btrfs.c | 2 +- fs/btrfs/btrfs.h | 6 +++--- fs/btrfs/extent-io.c | 4 ++-- fs/btrfs/inode.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c index aec91a57ec..7eb01c4ff9 100644 --- a/fs/btrfs/btrfs.c +++ b/fs/btrfs/btrfs.c @@ -277,7 +277,7 @@ int btrfs_read(const char *file, void *buf, loff_t offset, loff_t len, if (len > inode.size - offset) len = inode.size - offset; - rd = btrfs_file_read(&root, inr, offset, len, buf); + rd = __btrfs_file_read(&root, inr, offset, len, buf); if (rd == -1ULL) { printf("An error occured while reading file %s\n", file); return -1; diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h index e36bd89827..32ea2fc53a 100644 --- a/fs/btrfs/btrfs.h +++ b/fs/btrfs/btrfs.h @@ -58,16 +58,16 @@ int __btrfs_readlink(const struct __btrfs_root *, u64, char *); int btrfs_readlink(struct btrfs_root *root, u64 ino, char *target); u64 __btrfs_lookup_path(struct __btrfs_root *, u64, const char *, u8 *, struct btrfs_inode_item *, int); -u64 btrfs_file_read(const struct __btrfs_root *, u64, u64, u64, char *); +u64 __btrfs_file_read(const struct __btrfs_root *, u64, u64, u64, char *); /* subvolume.c */ u64 btrfs_get_default_subvol_objectid(void); /* extent-io.c */ -u64 btrfs_read_extent_inline(struct __btrfs_path *, +u64 __btrfs_read_extent_inline(struct __btrfs_path *, struct btrfs_file_extent_item *, u64, u64, char *); -u64 btrfs_read_extent_reg(struct __btrfs_path *, struct btrfs_file_extent_item *, +u64 __btrfs_read_extent_reg(struct __btrfs_path *, struct btrfs_file_extent_item *, u64, u64, char *); #endif /* !__BTRFS_BTRFS_H__ */ diff --git a/fs/btrfs/extent-io.c b/fs/btrfs/extent-io.c index a524145a66..ccf4da3177 100644 --- a/fs/btrfs/extent-io.c +++ b/fs/btrfs/extent-io.c @@ -14,7 +14,7 @@ #include "extent-io.h" #include "disk-io.h" -u64 btrfs_read_extent_inline(struct __btrfs_path *path, +u64 __btrfs_read_extent_inline(struct __btrfs_path *path, struct btrfs_file_extent_item *extent, u64 offset, u64 size, char *out) { @@ -66,7 +66,7 @@ err: return -1ULL; } -u64 btrfs_read_extent_reg(struct __btrfs_path *path, +u64 __btrfs_read_extent_reg(struct __btrfs_path *path, struct btrfs_file_extent_item *extent, u64 offset, u64 size, char *out) { diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 2e3fcad5a8..83d21467d9 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -598,7 +598,7 @@ u64 __btrfs_lookup_path(struct __btrfs_root *root, u64 inr, const char *path, return inr; } -u64 btrfs_file_read(const struct __btrfs_root *root, u64 inr, u64 offset, +u64 __btrfs_file_read(const struct __btrfs_root *root, u64 inr, u64 offset, u64 size, char *buf) { struct __btrfs_path path; @@ -633,11 +633,11 @@ u64 btrfs_file_read(const struct __btrfs_root *root, u64 inr, u64 offset, if (extent->type == BTRFS_FILE_EXTENT_INLINE) { btrfs_file_extent_item_to_cpu_inl(extent); - rd = btrfs_read_extent_inline(&path, extent, offset, + rd = __btrfs_read_extent_inline(&path, extent, offset, size, buf); } else { btrfs_file_extent_item_to_cpu(extent); - rd = btrfs_read_extent_reg(&path, extent, offset, size, + rd = __btrfs_read_extent_reg(&path, extent, offset, size, buf); }