-void obuck_init(int writeable);
-void obuck_cleanup(void);
-struct fastbuf * obuck_fetch(struct obuck_header *hdrp);
-void obuck_fetch_abort(struct fastbuf *b);
-void obuck_fetch_end(struct fastbuf *b);
-struct fastbuf * obuck_write(void);
-void obuck_write_end(struct fastbuf *b, struct obuck_header *hdrp);
+void obuck_init(int writeable); /* Initialize the bucket module */
+void obuck_cleanup(void); /* Clean up the bucket module */
+void obuck_sync(void); /* Flush all buffers to disk */
+void obuck_lock_read(void); /* Explicit locking to make sure other threads don't touch buckets now */
+void obuck_lock_write(void);
+void obuck_unlock(void);
+oid_t obuck_predict_last_oid(void); /* Get OID corresponding to the next to be created bucket (i.e., bucket file size estimate) */
+
+/* Searching for buckets */
+void obuck_find_by_oid(struct obuck_header *hdrp);
+int obuck_find_first(struct obuck_header *hdrp, int full);
+int obuck_find_next(struct obuck_header *hdrp, int full);
+
+/* Reading current bucket */
+struct fastbuf *obuck_fetch(void);
+
+/* Creating buckets */
+struct fastbuf *obuck_create(u32 type);
+void obuck_create_end(struct fastbuf *b, struct obuck_header *hdrp);
+
+/* Deleting buckets */