Simplify ulog_map

Get rid of the caller parameter.  The kproplog semantics (without -R)
for mapping the ulog are simple and almost completely different from
other users of the ulog, so implement them as a static helper in
kproplog.  With hierarchical iprop, kpropd will need the same
semantics as FKCOMMAND and FKADMIND, which were already identical.

Get rid of the db_args parameter, since ulog_map no longer opens the
database after #7552.

Remove an inoperative lseek() call when creating a new ulog file.
Rename ulog_filesize to filesize and compute it from scratch each time
we use it, for easier analysis.  If kdb_hmagic is zero, init the ulog
header but don't skip the rest of the function; it's possible that we
need to expand the ulog file.  Remove an unneeded conditional before
calling extend_file_to for an existing ulog.

ticket: 7855

1 files changed, 1 insertions, 2 deletions

diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 61efa507b4..e9cca8a618 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -508,8 +508,7 @@ main(int argc, char *argv[])
     if (params.iprop_enabled == TRUE) {
         ulog_set_role(context, IPROP_MASTER);
 
-        ret = ulog_map(context, params.iprop_logfile, params.iprop_ulogsize,
-                       FKADMIND, db_args);
+        ret = ulog_map(context, params.iprop_logfile, params.iprop_ulogsize);
         if (ret)
             fail_to_start(ret, _("mapping update log"));