* [PATCH] btrfs: send: update command for protocol version check
@ 2022-10-07 15:40 David Sterba
2022-10-09 21:59 ` Anand Jain
0 siblings, 1 reply; 2+ messages in thread
From: David Sterba @ 2022-10-07 15:40 UTC (permalink / raw)
To: linux-btrfs; +Cc: boris, David Sterba
For a protocol and command compatibility we have a helper that hasn't
been updated for v3 yet. We use it for verity so update where necessary.
Fixes: 38622010a6de ("btrfs: send: add support for fs-verity")
Signed-off-by: David Sterba <dsterba@suse.com>
---
fs/btrfs/send.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 178347666235..ec6e1752af2c 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -348,6 +348,7 @@ static bool proto_cmd_ok(const struct send_ctx *sctx, int cmd)
switch (sctx->proto) {
case 1: return cmd <= BTRFS_SEND_C_MAX_V1;
case 2: return cmd <= BTRFS_SEND_C_MAX_V2;
+ case 3: return cmd <= BTRFS_SEND_C_MAX_V3;
default: return false;
}
}
@@ -6469,7 +6470,9 @@ static int finish_inode_if_needed(struct send_ctx *sctx, int at_end)
if (ret < 0)
goto out;
}
- if (sctx->proto >= 3 && sctx->cur_inode_needs_verity) {
+
+ if (proto_cmd_ok(sctx, BTRFS_SEND_C_ENABLE_VERITY)
+ && sctx->cur_inode_needs_verity) {
ret = process_verity(sctx);
if (ret < 0)
goto out;
--
2.37.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] btrfs: send: update command for protocol version check
2022-10-07 15:40 [PATCH] btrfs: send: update command for protocol version check David Sterba
@ 2022-10-09 21:59 ` Anand Jain
0 siblings, 0 replies; 2+ messages in thread
From: Anand Jain @ 2022-10-09 21:59 UTC (permalink / raw)
To: David Sterba, linux-btrfs; +Cc: boris
On 10/7/22 23:40, David Sterba wrote:
> For a protocol and command compatibility we have a helper that hasn't
> been updated for v3 yet. We use it for verity so update where necessary.
>
> Fixes: 38622010a6de ("btrfs: send: add support for fs-verity")
> Signed-off-by: David Sterba <dsterba@suse.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
> ---
> fs/btrfs/send.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
> index 178347666235..ec6e1752af2c 100644
> --- a/fs/btrfs/send.c
> +++ b/fs/btrfs/send.c
> @@ -348,6 +348,7 @@ static bool proto_cmd_ok(const struct send_ctx *sctx, int cmd)
> switch (sctx->proto) {
> case 1: return cmd <= BTRFS_SEND_C_MAX_V1;
> case 2: return cmd <= BTRFS_SEND_C_MAX_V2;
> + case 3: return cmd <= BTRFS_SEND_C_MAX_V3;
> default: return false;
> }
> }
> @@ -6469,7 +6470,9 @@ static int finish_inode_if_needed(struct send_ctx *sctx, int at_end)
> if (ret < 0)
> goto out;
> }
> - if (sctx->proto >= 3 && sctx->cur_inode_needs_verity) {
> +
> + if (proto_cmd_ok(sctx, BTRFS_SEND_C_ENABLE_VERITY)
> + && sctx->cur_inode_needs_verity) {
> ret = process_verity(sctx);
> if (ret < 0)
> goto out;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-09 21:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-07 15:40 [PATCH] btrfs: send: update command for protocol version check David Sterba
2022-10-09 21:59 ` Anand Jain
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.