diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-15 14:08:21 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-15 14:08:21 -0700 |
| commit | f9c308664833ccba957050ac8a27c5e8a1b44e83 (patch) | |
| tree | 2c1ca6a3c9c44e79f7dbb00bd52a60cd450af9fd /lib | |
| parent | dac0fb0b7c369255e0d07e47a11f6a0288019da1 (diff) | |
| parent | f2b5b5bb17910c8a2b709fd62e214c96da3fdd2d (diff) | |
| download | samba-f9c308664833ccba957050ac8a27c5e8a1b44e83.tar.gz samba-f9c308664833ccba957050ac8a27c5e8a1b44e83.tar.bz2 samba-f9c308664833ccba957050ac8a27c5e8a1b44e83.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tdb/common/transaction.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c index e97fe67b4e..67a035879c 100644 --- a/lib/tdb/common/transaction.c +++ b/lib/tdb/common/transaction.c @@ -137,14 +137,6 @@ static int transaction_read(struct tdb_context *tdb, tdb_off_t off, void *buf, { uint32_t blk; - /* Only a commit is allowed on a prepared transaction */ - if (tdb->transaction->prepared) { - tdb->ecode = TDB_ERR_EINVAL; - TDB_LOG((tdb, TDB_DEBUG_FATAL, "transaction_read: transaction already prepared, read not allowed\n")); - tdb->transaction->transaction_error = 1; - return -1; - } - /* break it down into block sized ops */ while (len + (off % tdb->transaction->block_size) > tdb->transaction->block_size) { tdb_len_t len2 = tdb->transaction->block_size - (off % tdb->transaction->block_size); |