Merge tag 'xfs-6.9-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[sfrench/cifs-2.6.git] / fs / xfs / scrub / xfarray.h

diff --git a/fs/xfs/scrub/xfarray.h b/fs/xfs/scrub/xfarray.h
index 62b9c506fdd1b78c0b4e03f1992b45152341592c..acb2f94c56c13da8ea3775f28c6b36fd32690ccf 100644 (file)
--- a/fs/xfs/scrub/xfarray.h
+++ b/fs/xfs/scrub/xfarray.h
@@ -45,6 +45,25 @@ int xfarray_store(struct xfarray *array, xfarray_idx_t idx, const void *ptr);
 int xfarray_store_anywhere(struct xfarray *array, const void *ptr);
 bool xfarray_element_is_null(struct xfarray *array, const void *ptr);
 
+/*
+ * Load an array element, but zero the buffer if there's no data because we
+ * haven't stored to that array element yet.
+ */
+static inline int
+xfarray_load_sparse(
+       struct xfarray  *array,
+       uint64_t        idx,
+       void            *rec)
+{
+       int             error = xfarray_load(array, idx, rec);
+
+       if (error == -ENODATA) {
+               memset(rec, 0, array->obj_size);
+               return 0;
+       }
+       return error;
+}
+
 /* Append an element to the array. */
 static inline int xfarray_append(struct xfarray *array, const void *ptr)
 {
@@ -105,9 +124,14 @@ struct xfarray_sortinfo {
        /* XFARRAY_SORT_* flags; see below. */
        unsigned int            flags;
 
-       /* Cache a page here for faster access. */
-       struct xfile_page       xfpage;
-       void                    *page_kaddr;
+       /* Cache a folio here for faster scanning for pivots */
+       struct folio            *folio;
+
+       /* First array index in folio that is completely readable */
+       xfarray_idx_t           first_folio_idx;
+
+       /* Last array index in folio that is completely readable */
+       xfarray_idx_t           last_folio_idx;
 
 #ifdef DEBUG
        /* Performance statistics. */