diff options
| author | Karel Zak | 2015-01-26 12:25:40 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-01-26 12:25:40 +0100 |
| commit | 3df1a79ad5ed1d54af58a4c26c208c65e53e3f6c (patch) | |
| tree | 35670fc83b1ba36eeabf725ff62ad2c5309e8d92 /libmount | |
| parent | Merge branch 'timex' of https://github.com/kerolasa/lelux-utiliteetit (diff) | |
| download | kernel-qcow2-util-linux-3df1a79ad5ed1d54af58a4c26c208c65e53e3f6c.tar.gz kernel-qcow2-util-linux-3df1a79ad5ed1d54af58a4c26c208c65e53e3f6c.tar.xz kernel-qcow2-util-linux-3df1a79ad5ed1d54af58a4c26c208c65e53e3f6c.zip | |
libmount: add options map to docs
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount')
| -rw-r--r-- | libmount/docs/libmount-sections.txt | 1 | ||||
| -rw-r--r-- | libmount/src/libmount.h.in | 9 | ||||
| -rw-r--r-- | libmount/src/lock.c | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/libmount/docs/libmount-sections.txt b/libmount/docs/libmount-sections.txt index 38013042f..1fd509de8 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 a45e0fad7..30dc06b69 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 49aeae9aa..713b3e653 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 */ |