diff options
-rw-r--r-- | gl/lib/di-set.c | 22 | ||||
-rw-r--r-- | gl/lib/di-set.h | 2 | ||||
-rw-r--r-- | gl/tests/test-di-set.c | 2 |
3 files changed, 26 insertions, 0 deletions
diff --git a/gl/lib/di-set.c b/gl/lib/di-set.c index 05d24d609..5e839a311 100644 --- a/gl/lib/di-set.c +++ b/gl/lib/di-set.c @@ -235,3 +235,25 @@ di_set_insert (struct di_set *dis, dev_t dev, ino_t ino) /* Put I into the inode set. */ return hash_insert0 (ino_set, (void *) i, NULL); } + +/* Look up the DEV,INO pair in the set DIS. + If found, return 1; if not found, return 0. + Upon any failure return -1. */ +int +di_set_lookup (struct di_set *dis, dev_t dev, ino_t ino) +{ + hashint i; + + /* Map the device number to a set of inodes. */ + struct hash_table *ino_set = map_device (dis, dev); + if (! ino_set) + return -1; + + /* Map the inode number to a small representative I. */ + i = map_inode_number (dis, ino); + if (i == INO_MAP_INSERT_FAILURE) + return -1; + + /* Perform the look-up. */ + return !!hash_lookup (ino_set, (void const *) i); +} diff --git a/gl/lib/di-set.h b/gl/lib/di-set.h index d30a31e92..f05e8760c 100644 --- a/gl/lib/di-set.h +++ b/gl/lib/di-set.h @@ -10,3 +10,5 @@ struct di_set *di_set_alloc (void); int di_set_insert (struct di_set *, dev_t, ino_t) _ATTRIBUTE_NONNULL_ (1); void di_set_free (struct di_set *) _ATTRIBUTE_NONNULL_ (1); +int di_set_lookup (struct di_set *dis, dev_t dev, ino_t ino) + _ATTRIBUTE_NONNULL_ (1);; diff --git a/gl/tests/test-di-set.c b/gl/tests/test-di-set.c index 7fca4d462..5de8da2ff 100644 --- a/gl/tests/test-di-set.c +++ b/gl/tests/test-di-set.c @@ -42,10 +42,12 @@ main (void) struct di_set *dis = di_set_alloc (); ASSERT (dis); + ASSERT (di_set_lookup (dis, 2, 5) == 0); /* initial lookup fails */ ASSERT (di_set_insert (dis, 2, 5) == 1); /* first insertion succeeds */ ASSERT (di_set_insert (dis, 2, 5) == 0); /* duplicate fails */ ASSERT (di_set_insert (dis, 3, 5) == 1); /* diff dev, duplicate inode is ok */ ASSERT (di_set_insert (dis, 2, 8) == 1); /* same dev, different inode is ok */ + ASSERT (di_set_lookup (dis, 2, 5) == 1); /* now, the lookup succeeds */ /* very large (or negative) inode number */ ASSERT (di_set_insert (dis, 5, (ino_t) -1) == 1); |