sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

- added tdb_add_flags() and tdb_remove_flags()

Browse Source 
- make freelist merging more paranoid

- fixed TDB_DATA_STAART() (broken by earlier commit)

(This used to be ctdb commit c3be8eb7d1ca316111ec51f45dbca2fa5609cf93)
This commit is contained in:
Andrew Tridgell 2008-01-06 12:33:57 +11:00
parent 43aa27c9ee
commit ff039b405f
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ctdb/lib/tdb/common/freelist.c
View File

@ -138,7 +138,7 @@ left:
#endif #endif
/* Look left */ /* Look left */
if (offset - sizeof(tdb_off_t) >= TDB_DATA_START(tdb->header.hash_size)) { if (offset - sizeof(tdb_off_t) > TDB_DATA_START(tdb->header.hash_size)) {
tdb_off_t left = offset - sizeof(tdb_off_t); tdb_off_t left = offset - sizeof(tdb_off_t);
struct list_struct l; struct list_struct l;
tdb_off_t leftsize; tdb_off_t leftsize;
@ -156,7 +156,8 @@ left:
left = offset - leftsize; left = offset - leftsize;
if (left < TDB_DATA_START(tdb->header.hash_size)) { if (leftsize > offset ||
left < TDB_DATA_START(tdb->header.hash_size)) {
goto update; goto update;
} }

10
ctdb/lib/tdb/common/tdb.c
View File

@ -666,6 +666,16 @@ int tdb_get_flags(struct tdb_context *tdb)
return tdb->flags; return tdb->flags;
} }
void tdb_add_flags(struct tdb_context *tdb, unsigned flags)
{
tdb->flags |= flags;
}
void tdb_remove_flags(struct tdb_context *tdb, unsigned flags)
{
tdb->flags &= ~flags;
}
/* /*
enable sequence number handling on an open tdb enable sequence number handling on an open tdb

2
ctdb/lib/tdb/common/tdb_private.h
View File

@ -58,7 +58,7 @@ typedef uint32_t tdb_off_t;
#define TDB_BAD_MAGIC(r) ((r)->magic != TDB_MAGIC && !TDB_DEAD(r)) #define TDB_BAD_MAGIC(r) ((r)->magic != TDB_MAGIC && !TDB_DEAD(r))
#define TDB_HASH_TOP(hash) (FREELIST_TOP + (BUCKET(hash)+1)*sizeof(tdb_off_t)) #define TDB_HASH_TOP(hash) (FREELIST_TOP + (BUCKET(hash)+1)*sizeof(tdb_off_t))
#define TDB_HASHTABLE_SIZE(tdb) ((tdb->header.hash_size+1)*sizeof(tdb_off_t)) #define TDB_HASHTABLE_SIZE(tdb) ((tdb->header.hash_size+1)*sizeof(tdb_off_t))
#define TDB_DATA_START(hash_size) TDB_HASH_TOP(hash_size) #define TDB_DATA_START(hash_size) (TDB_HASH_TOP(hash_size-1) + sizeof(tdb_off_t))
#define TDB_RECOVERY_HEAD offsetof(struct tdb_header, recovery_start) #define TDB_RECOVERY_HEAD offsetof(struct tdb_header, recovery_start)
#define TDB_SEQNUM_OFS offsetof(struct tdb_header, sequence_number) #define TDB_SEQNUM_OFS offsetof(struct tdb_header, sequence_number)
#define TDB_PAD_BYTE 0x42 #define TDB_PAD_BYTE 0x42

3
ctdb/lib/tdb/include/tdb.h
View File

@ -135,6 +135,8 @@ int tdb_get_seqnum(struct tdb_context *tdb);
int tdb_hash_size(struct tdb_context *tdb); int tdb_hash_size(struct tdb_context *tdb);
size_t tdb_map_size(struct tdb_context *tdb); size_t tdb_map_size(struct tdb_context *tdb);
int tdb_get_flags(struct tdb_context *tdb); int tdb_get_flags(struct tdb_context *tdb);
void tdb_add_flags(struct tdb_context *tdb, unsigned flag);
void tdb_remove_flags(struct tdb_context *tdb, unsigned flag);
void tdb_enable_seqnum(struct tdb_context *tdb); void tdb_enable_seqnum(struct tdb_context *tdb);
void tdb_increment_seqnum_nonblock(struct tdb_context *tdb); void tdb_increment_seqnum_nonblock(struct tdb_context *tdb);
@ -153,6 +155,7 @@ void tdb_setalarm_sigptr(struct tdb_context *tdb, volatile sig_atomic_t *sigptr)
void tdb_dump_all(struct tdb_context *tdb); void tdb_dump_all(struct tdb_context *tdb);
int tdb_printfreelist(struct tdb_context *tdb); int tdb_printfreelist(struct tdb_context *tdb);
int tdb_validate_freelist(struct tdb_context *tdb, int *pnum_entries); int tdb_validate_freelist(struct tdb_context *tdb, int *pnum_entries);
int tdb_wipe_all(struct tdb_context *tdb);
extern TDB_DATA tdb_null; extern TDB_DATA tdb_null;