We keep track of this information in the ordered extent for writes, but
we need it for reads as well.  Add fscrypt_extent_info and orig_start to
the dio_data so we can populate this on reads.  This will be used later
when we attach the fscrypt context to the bios.

Signed-off-by: Josef Bacik <jo...@toxicpanda.com>
---
 fs/btrfs/inode.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 19831291fb54..89cb09a40f58 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -83,6 +83,8 @@ struct btrfs_dio_data {
        ssize_t submitted;
        struct extent_changeset *data_reserved;
        struct btrfs_ordered_extent *ordered;
+       struct fscrypt_extent_info *fscrypt_info;
+       u64 orig_start;
        bool data_space_reserved;
        bool nocow_done;
 };
@@ -7729,6 +7731,10 @@ static int btrfs_dio_iomap_begin(struct inode *inode, 
loff_t start,
                                                               release_len);
                }
        } else {
+               dio_data->fscrypt_info =
+                       fscrypt_get_extent_info(em->fscrypt_info);
+               dio_data->orig_start = em->orig_start;
+
                /*
                 * We need to unlock only the end area that we aren't using.
                 * The rest is going to be unlocked by the endio routine.
@@ -7810,6 +7816,11 @@ static int btrfs_dio_iomap_end(struct inode *inode, 
loff_t pos, loff_t length,
                dio_data->ordered = NULL;
        }
 
+       if (dio_data->fscrypt_info) {
+               fscrypt_put_extent_info(dio_data->fscrypt_info);
+               dio_data->fscrypt_info = NULL;
+       }
+
        if (write)
                extent_changeset_free(dio_data->data_reserved);
        return ret;
-- 
2.41.0

Reply via email to