Hi,

On Tue, Jan 10, 2023 at 12:38:14PM +0800, Wang Yugui wrote:

...

Hi, Sasha Levin

please rebase the patch queue-6.1(btrfs: fix an error handling path in btrfs_defrag_leaves) just like queue-6.0, and then drop its 8 depency patches.

the 2 of 8 depency patches are file rename, so it will make later depency patch become difficult? #btrfs-move-btrfs_get_block_group-helper-out-of-disk-.patch #btrfs-move-flush-related-definitions-to-space-info.h.patch #btrfs-move-btrfs_print_data_csum_error-into-inode.c.patch #btrfs-move-fs-wide-helpers-out-of-ctree.h.patch #btrfs-move-assert-helpers-out-of-ctree.h.patch #btrfs-move-the-printk-helpers-out-of-ctree.h.patch #**btrfs-rename-struct-funcs.c-to-accessors.c.patch #**btrfs-rename-tree-defrag.c-to-defrag.c.patch

and the patch(btrfs: fix an error handling path in btrfs_defrag_leaves) is small, so a rebase will be a good choice.

I do not understand, sorry, we can not rebase anything, that's not how our patch queue works.

So what exactly do you want to see changed? What patches dropped? And what added?

What I suggest:

1)replace queue-6.1/btrfs-fix-an-error-handling-path-in-btrfs_defrag_lea.patch with queue-6.0/btrfs-fix-an-error-handling-path-in-btrfs_defrag_lea.patch

2) drop pathes in queue-6.1/ btrfs-move-btrfs_get_block_group-helper-out-of-disk-.patch btrfs-move-flush-related-definitions-to-space-info.h.patch btrfs-move-btrfs_print_data_csum_error-into-inode.c.patch btrfs-move-fs-wide-helpers-out-of-ctree.h.patch btrfs-move-assert-helpers-out-of-ctree.h.patch btrfs-move-the-printk-helpers-out-of-ctree.h.patch btrfs-rename-struct-funcs.c-to-accessors.c.patch btrfs-rename-tree-defrag.c-to-defrag.c.patch

Best Regards Wang Yugui (wangyugui@e16-tech.com) 2023/01/10

thanks,

greg k-h

On Tue, Jan 10, 2023 at 03:30:08PM +0100, David Sterba wrote:

On Tue, Jan 10, 2023 at 04:42:35PM +0800, Wang Yugui wrote:

...

Hi,

...

On Tue, Jan 10, 2023 at 12:38:14PM +0800, Wang Yugui wrote:

...

Hi, Sasha Levin

please rebase the patch queue-6.1(btrfs: fix an error handling path in btrfs_defrag_leaves) just like queue-6.0, and then drop its 8 depency patches.

the 2 of 8 depency patches are file rename, so it will make later depency patch become difficult? #btrfs-move-btrfs_get_block_group-helper-out-of-disk-.patch #btrfs-move-flush-related-definitions-to-space-info.h.patch #btrfs-move-btrfs_print_data_csum_error-into-inode.c.patch #btrfs-move-fs-wide-helpers-out-of-ctree.h.patch #btrfs-move-assert-helpers-out-of-ctree.h.patch #btrfs-move-the-printk-helpers-out-of-ctree.h.patch #**btrfs-rename-struct-funcs.c-to-accessors.c.patch #**btrfs-rename-tree-defrag.c-to-defrag.c.patch

and the patch(btrfs: fix an error handling path in btrfs_defrag_leaves) is small, so a rebase will be a good choice.

I do not understand, sorry, we can not rebase anything, that's not how our patch queue works.

So what exactly do you want to see changed? What patches dropped? And what added?

What I suggest:

1)replace queue-6.1/btrfs-fix-an-error-handling-path-in-btrfs_defrag_lea.patch with queue-6.0/btrfs-fix-an-error-handling-path-in-btrfs_defrag_lea.patch

2. drop pathes in queue-6.1/

btrfs-move-btrfs_get_block_group-helper-out-of-disk-.patch btrfs-move-flush-related-definitions-to-space-info.h.patch btrfs-move-btrfs_print_data_csum_error-into-inode.c.patch btrfs-move-fs-wide-helpers-out-of-ctree.h.patch btrfs-move-assert-helpers-out-of-ctree.h.patch btrfs-move-the-printk-helpers-out-of-ctree.h.patch btrfs-rename-struct-funcs.c-to-accessors.c.patch btrfs-rename-tree-defrag.c-to-defrag.c.patch

Right, I'd rather not add all the code moving patches to stable though I understand that it could ease backporting. Many stable backports need to be adapted to versions before/after the code moves so the work has to be done anyway.

Okay, done.