projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tunneling: Clear OVS_CB after call to update_header().
[openvswitch]
/
ovsdb
/
file.c
diff --git
a/ovsdb/file.c
b/ovsdb/file.c
index cf5bb41d4b10a7f84397dd77ef7abfe900cba0ec..d09395c4cfc37207a3fbeeb842a7b79b95e9e0ff 100644
(file)
--- a/
ovsdb/file.c
+++ b/
ovsdb/file.c
@@
-36,10
+36,10
@@
#include "transaction.h"
#include "uuid.h"
#include "util.h"
#include "transaction.h"
#include "uuid.h"
#include "util.h"
-
-#define THIS_MODULE VLM_ovsdb_file
#include "vlog.h"
#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(ovsdb_file);
+
/* Minimum number of milliseconds between database compactions. */
#define COMPACT_MIN_MSEC (10 * 60 * 1000) /* 10 minutes. */
/* Minimum number of milliseconds between database compactions. */
#define COMPACT_MIN_MSEC (10 * 60 * 1000) /* 10 minutes. */
@@
-427,7
+427,7
@@
ovsdb_file_save_copy__(const char *file_name, int locking,
const struct ovsdb_table *table = node->data;
const struct ovsdb_row *row;
const struct ovsdb_table *table = node->data;
const struct ovsdb_row *row;
- HMAP_FOR_EACH (row,
struct ovsdb_row,
hmap_node, &table->rows) {
+ HMAP_FOR_EACH (row, hmap_node, &table->rows) {
ovsdb_file_txn_add_row(&ftxn, NULL, row, NULL);
}
}
ovsdb_file_txn_add_row(&ftxn, NULL, row, NULL);
}
}
@@
-737,7
+737,7
@@
ovsdb_file_txn_commit(struct json *json, const char *comment,
if (comment) {
json_object_put_string(json, "_comment", comment);
}
if (comment) {
json_object_put_string(json, "_comment", comment);
}
- json_object_put(json, "_date", json_integer_create(time_
now
()));
+ json_object_put(json, "_date", json_integer_create(time_
wall
()));
error = ovsdb_log_write(log, json);
json_destroy(json);
error = ovsdb_log_write(log, json);
json_destroy(json);