| Message ID | a3d01ef26525e9730f1d94de3d7c8e57f3c73fc7.1710458248.git.boris@bur.io (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs-progs: use EXPERIMENTAL instead of CONFIG_BTRFS_DEBUG | expand |
在 2024/3/15 09:49, Boris Burkov 写道: > not sure exactly how this ifdef was supposed to work originally, but it > currently doesn't and I don't see other use cases of this pattern. > > Use EXPERIMENTAL which does work after: > > ./configure --enable-experimental > > Signed-off-by: Boris Burkov <boris@bur.io> Reviewed-by: Qu Wenruo <wqu@suse.com> This seems to be a direct sync between kernel and btrfs-progs, thus we got the kernel macro not properly translated. Thanks, Qu > --- > kernel-shared/send.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel-shared/send.h b/kernel-shared/send.h > index 34de60ff0..ce4a99e31 100644 > --- a/kernel-shared/send.h > +++ b/kernel-shared/send.h > @@ -25,7 +25,7 @@ > > #define BTRFS_SEND_STREAM_MAGIC "btrfs-stream" > /* Conditional support for the upcoming protocol version. */ > -#ifdef CONFIG_BTRFS_DEBUG > +#if EXPERIMENTAL > #define BTRFS_SEND_STREAM_VERSION 3 > #else > #define BTRFS_SEND_STREAM_VERSION 2
On 3/15/24 04:49, Boris Burkov wrote: > not sure exactly how this ifdef was supposed to work originally, but it > currently doesn't and I don't see other use cases of this pattern. > > Use EXPERIMENTAL which does work after: > Reviewed-by: Anand Jain <anand.jain@oracle.com> Thanks. > ./configure --enable-experimental > > Signed-off-by: Boris Burkov <boris@bur.io> > --- > kernel-shared/send.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel-shared/send.h b/kernel-shared/send.h > index 34de60ff0..ce4a99e31 100644 > --- a/kernel-shared/send.h > +++ b/kernel-shared/send.h > @@ -25,7 +25,7 @@ > > #define BTRFS_SEND_STREAM_MAGIC "btrfs-stream" > /* Conditional support for the upcoming protocol version. */ > -#ifdef CONFIG_BTRFS_DEBUG > +#if EXPERIMENTAL > #define BTRFS_SEND_STREAM_VERSION 3 > #else > #define BTRFS_SEND_STREAM_VERSION 2
On Thu, Mar 14, 2024 at 04:19:00PM -0700, Boris Burkov wrote: > not sure exactly how this ifdef was supposed to work originally, but it > currently doesn't and I don't see other use cases of this pattern. > > Use EXPERIMENTAL which does work after: Ok, makes sense. I missed that because I searched for EXPERIMENTAL and did not find anything relevant but CONFIG_BTRFS_DEBUG has an effect. I'll add a comment so it does not get accidentally changed back when syncin the kernel code. Thanks.
在 2024/3/19 08:47, David Sterba 写道: > On Thu, Mar 14, 2024 at 04:19:00PM -0700, Boris Burkov wrote: >> not sure exactly how this ifdef was supposed to work originally, but it >> currently doesn't and I don't see other use cases of this pattern. >> >> Use EXPERIMENTAL which does work after: > > Ok, makes sense. I missed that because I searched for EXPERIMENTAL and > did not find anything relevant but CONFIG_BTRFS_DEBUG has an effect. > I'll add a comment so it does not get accidentally changed back when > syncin the kernel code. Thanks. > Can't we just convert CONFIG_BTRFS_DEBUG to EXPERIMENTAL in kerncompat.h? Thanks, Qu
On Tue, Mar 19, 2024 at 10:37:40AM +1030, Qu Wenruo wrote: > > > 在 2024/3/19 08:47, David Sterba 写道: > > On Thu, Mar 14, 2024 at 04:19:00PM -0700, Boris Burkov wrote: > >> not sure exactly how this ifdef was supposed to work originally, but it > >> currently doesn't and I don't see other use cases of this pattern. > >> > >> Use EXPERIMENTAL which does work after: > > > > Ok, makes sense. I missed that because I searched for EXPERIMENTAL and > > did not find anything relevant but CONFIG_BTRFS_DEBUG has an effect. > > I'll add a comment so it does not get accidentally changed back when > > syncin the kernel code. Thanks. > > > Can't we just convert CONFIG_BTRFS_DEBUG to EXPERIMENTAL in kerncompat.h? In principle yes, but the code from kernel and user space is not close enough so that would be safe so this needs an audit what could break.
diff --git a/kernel-shared/send.h b/kernel-shared/send.h index 34de60ff0..ce4a99e31 100644 --- a/kernel-shared/send.h +++ b/kernel-shared/send.h @@ -25,7 +25,7 @@ #define BTRFS_SEND_STREAM_MAGIC "btrfs-stream" /* Conditional support for the upcoming protocol version. */ -#ifdef CONFIG_BTRFS_DEBUG +#if EXPERIMENTAL #define BTRFS_SEND_STREAM_VERSION 3 #else #define BTRFS_SEND_STREAM_VERSION 2
not sure exactly how this ifdef was supposed to work originally, but it currently doesn't and I don't see other use cases of this pattern. Use EXPERIMENTAL which does work after: ./configure --enable-experimental Signed-off-by: Boris Burkov <boris@bur.io> --- kernel-shared/send.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)