]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: create iterator error codes
authorDarrick J. Wong <darrick.wong@oracle.com>
Wed, 28 Aug 2019 16:08:09 +0000 (12:08 -0400)
committerEric Sandeen <sandeen@redhat.com>
Wed, 28 Aug 2019 16:08:09 +0000 (12:08 -0400)
Source kernel commit: 5bb46e3e180d28c7ee6715f47c344be366a3fcc8

Currently, xfs doesn't have generic error codes defined for "stop
iterating"; we just reuse the XFS_BTREE_QUERY_* return values.  This
looks a little weird if we're not actually iterating a btree index.
Before we start adding more iterators, we should create general
XFS_ITER_{CONTINUE,ABORT} return values and define the XFS_BTREE_QUERY_*
ones from that.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
libxfs/xfs_alloc.c
libxfs/xfs_btree.h
libxfs/xfs_shared.h

index 18346428334a2fcb460066070bc8ad1ba2acc1ae..f5200ae88d5c1436a9076cd61ed3c71d5f780ee1 100644 (file)
@@ -3132,7 +3132,7 @@ xfs_alloc_has_record(
 
 /*
  * Walk all the blocks in the AGFL.  The @walk_fn can return any negative
- * error code or XFS_BTREE_QUERY_RANGE_ABORT.
+ * error code or XFS_ITER_*.
  */
 int
 xfs_agfl_walk(
index fcceb7c2ac527bc501683f2052feec6eb47c87bc..80b7f9e97fe3fbfbac3ef26864000954fc55bc2f 100644 (file)
@@ -465,8 +465,8 @@ uint xfs_btree_compute_maxlevels(uint *limits, unsigned long len);
 unsigned long long xfs_btree_calc_size(uint *limits, unsigned long long len);
 
 /* return codes */
-#define XFS_BTREE_QUERY_RANGE_CONTINUE 0       /* keep iterating */
-#define XFS_BTREE_QUERY_RANGE_ABORT    1       /* stop iterating */
+#define XFS_BTREE_QUERY_RANGE_CONTINUE (XFS_ITER_CONTINUE) /* keep iterating */
+#define XFS_BTREE_QUERY_RANGE_ABORT    (XFS_ITER_ABORT)    /* stop iterating */
 typedef int (*xfs_btree_query_range_fn)(struct xfs_btree_cur *cur,
                union xfs_btree_rec *rec, void *priv);
 
index c45acbd3add94d17ea83b5863cb1312cdb0c9f9b..e0641b7337b3cf27fb6b0fd4a5953691901e0154 100644 (file)
@@ -177,4 +177,10 @@ struct xfs_ino_geometry {
        unsigned int    agino_log;      /* #bits for agino in inum */
 };
 
+/* Keep iterating the data structure. */
+#define XFS_ITER_CONTINUE      (0)
+
+/* Stop iterating the data structure. */
+#define XFS_ITER_ABORT         (1)
+
 #endif /* __XFS_SHARED_H__ */