From 8fc14a03cbeaa56ae78e439fa79db0f5d8cd2116 Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Fri, 23 Feb 2024 11:23:57 -0500 Subject: [PATCH] LU-13814 llite: add to/from to ll_dio_pages ll_dio_pages is the main way we package pages for a DIO, so as we work on removing cl_page for DIO, we need to put some of the info in this struct. This puts the 'to, from' page offsets for incomplete pages in the package. This works because all pages except the first and the last must be complete (the first and last can be the same page). Test-Parameters: trivial Signed-off-by: Patrick Farrell Change-Id: I0ae4d617cb2f1310ae5981a9f9eb1480d13e1054 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52101 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: Sebastien Buisson Reviewed-by: Qian Yingjin Reviewed-by: Andreas Dilger --- lustre/include/cl_object.h | 7 ++++++- lustre/llite/rw26.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h index 623c1a1..2d570f2 100644 --- a/lustre/include/cl_object.h +++ b/lustre/include/cl_object.h @@ -2517,7 +2517,12 @@ struct ll_dio_pages { /** # of pages in the array. */ size_t ldp_count; /* the file offset of the first page. */ - loff_t ldp_file_offset; + loff_t ldp_file_offset; + /* the first and last page can be incomplete, this records the + * offsets + */ + int ldp_from; + int ldp_to; }; /* Top level struct used for AIO and DIO */ diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c index 110af3c..b28d9d8 100644 --- a/lustre/llite/rw26.c +++ b/lustre/llite/rw26.c @@ -386,6 +386,9 @@ ll_direct_rw_pages(const struct lu_env *env, struct cl_io *io, size_t size, ENTRY; + pv->ldp_from = offset & ~PAGE_MASK; + pv->ldp_to = (offset + size) & ~PAGE_MASK; + cl_2queue_init(queue); while (size > 0) { size_t from = offset & ~PAGE_MASK; -- 1.8.3.1