From: Karel Zak <kzak@redhat.com>
Date: Mon, 26 Jan 2015 11:25:40 +0000 (+0100)
Subject: libmount: add options map to docs
X-Git-Tag: v2.26-rc2~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3df1a79ad5ed1d54af58a4c26c208c65e53e3f6c;p=thirdparty%2Futil-linux.git

libmount: add options map to docs

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/docs/libmount-sections.txt b/libmount/docs/libmount-sections.txt
index 38013042fc..1fd509de81 100644
--- a/libmount/docs/libmount-sections.txt
+++ b/libmount/docs/libmount-sections.txt
@@ -263,6 +263,7 @@ mnt_lock_block_signals
 
 <SECTION>
 <FILE>optmap</FILE>
+libmnt_optmap
 mnt_get_builtin_optmap
 MNT_INVERT
 MNT_NOMTAB
diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index a45e0fad7e..30dc06b698 100644
--- a/libmount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
@@ -57,14 +57,17 @@ struct libmnt_iter;
 
 /**
  * libmnt_optmap:
+ * @name: option name[=type] where type is printf-like type specifier")
+ * @id: option ID or MS_* flags (e.g MS_RDONLY)
+ * @mask: MNT_{NOMTAB,INVERT,...} mask
  *
  * Mount options description (map)
  */
 struct libmnt_optmap
 {
-	const char	*name;	 /* option name[=%<type>] (e.g. "loop[=%s]") */
-	int		id;	 /* option ID or MS_* flags (e.g MS_RDONLY) */
-	int		mask;	 /* MNT_{NOMTAB,INVERT,...} mask */
+	const char	*name;
+	int		id;
+	int		mask;
 };
 
 /*
diff --git a/libmount/src/lock.c b/libmount/src/lock.c
index 49aeae9aa3..713b3e653a 100644
--- a/libmount/src/lock.c
+++ b/libmount/src/lock.c
@@ -260,8 +260,11 @@ static int mnt_wait_mtab_lock(struct libmnt_lock *ml, struct flock *fl, time_t m
 	int ret = 0;
 
 	gettime_monotonic(&now);
-	DBG(LOCKS, ul_debugobj(ml, "(%d) waiting for F_SETLKW (now=%ju, maxtime=%ju, diff=%ju)",
-				getpid(), now.tv_sec, maxtime, maxtime - now.tv_sec));
+	DBG(LOCKS, ul_debugobj(ml, "(%d) waiting for F_SETLKW (now=%lu, maxtime=%lu, diff=%lu)",
+				getpid(),
+				(unsigned long) now.tv_sec,
+				(unsigned long) maxtime,
+				(unsigned long) (maxtime - now.tv_sec)));
 
 	if (now.tv_sec >= maxtime)
 		return 1;		/* timeout */