public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@kernel.org>
To: Eric Sandeen <esandeen@redhat.com>
Cc: xfs <linux-xfs@vger.kernel.org>
Subject: [PATCH 4/3] xfs: sync xfs_btree_split macros with userspace libxfs
Date: Tue, 9 Nov 2021 18:34:05 -0800	[thread overview]
Message-ID: <20211110023405.GY24307@magnolia> (raw)
In-Reply-To: <a98ed48b-7297-34af-2a2a-795b15b35f12@redhat.com>

From: Darrick J. Wong <djwong@kernel.org>

Sync this one last bit of discrepancy between kernel and userspace
libxfs.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 fs/xfs/libxfs/xfs_btree.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
index b4e19aacb9de..d8a859bc797a 100644
--- a/fs/xfs/libxfs/xfs_btree.c
+++ b/fs/xfs/libxfs/xfs_btree.c
@@ -2785,6 +2785,7 @@ __xfs_btree_split(
 	return error;
 }
 
+#ifdef __KERNEL__
 struct xfs_btree_split_args {
 	struct xfs_btree_cur	*cur;
 	int			level;
@@ -2870,6 +2871,9 @@ xfs_btree_split(
 	destroy_work_on_stack(&args.work);
 	return args.result;
 }
+#else /* !KERNEL */
+#define xfs_btree_split		__xfs_btree_split
+#endif
 
 
 /*

  parent reply	other threads:[~2021-11-10  2:34 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-10  1:56 [PATCH 0/3] xfs: #ifdef out perag code for userspace Eric Sandeen
2021-11-10  1:58 ` [PATCH 1/3] libxfs: " Eric Sandeen
2021-11-10  4:23   ` Darrick J. Wong
2021-11-10  2:00 ` [PATCH 2/3] libxfs: #ifdef out perag code for userspace (xfsprogs version) Eric Sandeen
2021-11-10  2:02 ` [PATCH 3/3] xfsprogs: remove kernel stubs from xfs_shared.h Eric Sandeen
2021-11-10  4:26   ` Darrick J. Wong
2021-11-10  2:34 ` Darrick J. Wong [this message]
2021-11-10 17:12   ` [PATCH 4/3] xfs: sync xfs_btree_split macros with userspace libxfs Eric Sandeen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211110023405.GY24307@magnolia \
    --to=djwong@kernel.org \
    --cc=esandeen@redhat.com \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox