[PATCH 03/11] xfs: factor out xfs_dir2_leaf_find_stale

Christoph Hellwig
2011-07-10T20:50:21Z

[-- Attachment #1: xfs-add-xfs_dir2_find_stale-helper --]
[-- Type: text/plain, Size: 3191 bytes --]

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfs/fs/xfs/xfs_dir2_leaf.c
===================================================================
--- xfs.orig/fs/xfs/xfs_dir2_leaf.c 2011-07-09 12:07:49.518499801 +0200
+++ xfs/fs/xfs/xfs_dir2_leaf.c 2011-07-09 12:19:48.171796748 +0200
@@ -148,6 +148,36 @@ xfs_dir2_block_to_leaf(
return 0;
}

+STATIC void
+xfs_dir2_leaf_find_stale(
+ struct xfs_dir2_leaf *leaf,
+ int index,
+ int *lowstale,
+ int *highstale)
+{
+ /*
+ * Find the first stale entry before our index, if any.
+ */
+ for (*lowstale = index - 1;
+ *lowstale >= 0 &&
+ leaf->ents[*lowstale].address !=
+ cpu_to_be32(XFS_DIR2_NULL_DATAPTR);
+ --*lowstale)
+ continue;
+
+ /*
+ * Find the first stale entry at or after our index, if any.
+ * Stop if the answer would be worse than lowstale.
+ */
+ for (*highstale = index;
+ *highstale < be16_to_cpu(leaf->hdr.count) &&
+ leaf->ents[*highstale].address !=
+ cpu_to_be32(XFS_DIR2_NULL_DATAPTR) &&
+ (*lowstale < 0 || index - *lowstale > *highstale - index);
+ ++*highstale)
+ continue;
+}
+
struct xfs_dir2_leaf_entry *
xfs_dir2_leaf_find_entry(
xfs_dir2_leaf_t *leaf, /* leaf structure */
@@ -190,32 +220,8 @@ xfs_dir2_leaf_find_entry(
* If we didn't compact before, we need to find the nearest stale
* entries before and after our insertion point.
*/
- if (compact == 0) {
- /*
- * Find the first stale entry before the insertion point,
- * if any.
- */
- for (lowstale = index - 1;
- lowstale >= 0 &&
- leaf->ents[lowstale].address !=
- cpu_to_be32(XFS_DIR2_NULL_DATAPTR);
- lowstale--)
- continue;
-
- /*
- * Find the next stale entry at or after the insertion point,
- * if any. Stop if we go so far that the lowstale entry
- * would be better.
- */
- for (highstale = index;
- highstale < be16_to_cpu(leaf->hdr.count) &&
- leaf->ents[highstale].address !=
- cpu_to_be32(XFS_DIR2_NULL_DATAPTR) &&
- (lowstale < 0 ||
- index - lowstale - 1 >= highstale - index);
- highstale++)
- continue;
- }
+ if (compact == 0)
+ xfs_dir2_leaf_find_stale(leaf, index, &lowstale, &highstale);

/*
* If the low one is better, use it.
@@ -689,26 +695,9 @@ xfs_dir2_leaf_compact_x1(
leaf = bp->data;
ASSERT(be16_to_cpu(leaf->hdr.stale) > 1);
index = *indexp;
- /*
- * Find the first stale entry before our index, if any.
- */
- for (lowstale = index - 1;
- lowstale >= 0 &&
- leaf->ents[lowstale].address !=
- cpu_to_be32(XFS_DIR2_NULL_DATAPTR);
- lowstale--)
- continue;
- /*
- * Find the first stale entry at or after our index, if any.
- * Stop if the answer would be worse than lowstale.
- */
- for (highstale = index;
- highstale < be16_to_cpu(leaf->hdr.count) &&
- leaf->ents[highstale].address !=
- cpu_to_be32(XFS_DIR2_NULL_DATAPTR) &&
- (lowstale < 0 || index - lowstale > highstale - index);
- highstale++)
- continue;
+
+ xfs_dir2_leaf_find_stale(leaf, index, &lowstale, &highstale);
+
/*
* Pick the better of lowstale and highstale.
*/