When packaging for Debian, lintian complained about some minor issues. These were typo's and an unknown macro in a man-page.
I interpreted the unknown macro to be comments, but I may be wrong about that. The command I used to check the man-page is: $ man --warning src/sanlock.8 > /dev/null
The patches were applied to address these issues.
Håvard Flaget Aasen (2): man-page: Change unknown macro to comment Fix typo's
python/sanlock.c | 4 ++-- src/paxos_lease.c | 6 ++--- src/sanlock.8 | 60 +++++++++++++++++++++++------------------------ 3 files changed, 35 insertions(+), 35 deletions(-)
Signed-off-by: Håvard Flaget Aasen haavard_aasen@yahoo.no --- src/sanlock.8 | 52 +++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/sanlock.8 b/src/sanlock.8 index d77f24c..f33d5be 100644 --- a/src/sanlock.8 +++ b/src/sanlock.8 @@ -611,9 +611,9 @@ seconds a host id bit will remain set in delta lease bitmap .BI -e " str" local host name used in delta leases
-./" non-aio is untested and may not work -./" .BR -a " 0|1" -./" use async i/o +." non-aio is untested and may not work +." .BR -a " 0|1" +." use async i/o
.SS Client Command
@@ -817,9 +817,9 @@ Rebuild the rindex entries by scanning the disk for resource leases. .I action [options]
-./" non-aio is untested and may not work -./" .BR -a " 0|1" -./" use async i/o +." non-aio is untested and may not work +." .BR -a " 0|1" +." use async i/o
.BI -o " sec" io timeout in seconds @@ -846,26 +846,26 @@ resource lease on disk so it cannot be used until reinitialized normally.
Read a leader record from disk and print the fields. The leader record is the single sector of a delta lease, or the first sector of a paxos lease. -./" .P -./" .BR "sanlock direct acquire_id -s" " LOCKSPACE" -./" .br -./" .BR "sanlock direct renew_id -s" " LOCKSPACE" -./" .br -./" .BR "sanlock direct release_id -s" " LOCKSPACE" -./" -./" Acquire, renew, or release a host_id directly to disk, independent from -./" the sanlock daemon. Not for general use. This should only be used for -./" testing or for manual recovery in an emergency. -./" -./" .P -./" .BR "sanlock direct acquire -r" " RESOURCE " \ -./" \fB-i\fP " " \fInum\fP " " \fB-g\fP " " \fInum\fP -./" .br -./" .BR "sanlock direct release -r" " RESOURCE " \ -./" \fB-i\fP " " \fInum\fP " " \fB-g\fP " " \fInum\fP -./" -./" Not supported. Not for general use. -./" +." .P +." .BR "sanlock direct acquire_id -s" " LOCKSPACE" +." .br +." .BR "sanlock direct renew_id -s" " LOCKSPACE" +." .br +." .BR "sanlock direct release_id -s" " LOCKSPACE" +." +." Acquire, renew, or release a host_id directly to disk, independent from +." the sanlock daemon. Not for general use. This should only be used for +." testing or for manual recovery in an emergency. +." +." .P +." .BR "sanlock direct acquire -r" " RESOURCE " \ +." \fB-i\fP " " \fInum\fP " " \fB-g\fP " " \fInum\fP +." .br +." .BR "sanlock direct release -r" " RESOURCE " \ +." \fB-i\fP " " \fInum\fP " " \fB-g\fP " " \fInum\fP +." +." Not supported. Not for general use. +."
.BI "sanlock direct dump" " path" \ \fR[\fP\fB:\fP\fIoffset\fP\fR[\fP\fB:\fP\fIsize\fP\fR]]\fP
Signed-off-by: Håvard Flaget Aasen haavard_aasen@yahoo.no --- python/sanlock.c | 4 ++-- src/paxos_lease.c | 6 +++--- src/sanlock.8 | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/python/sanlock.c b/python/sanlock.c index d616008..6cdbbc9 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -689,7 +689,7 @@ finally: PyDoc_STRVAR(pydoc_add_lockspace, "\ add_lockspace(lockspace, host_id, path, offset=0, iotimeout=0, wait=True)\n\ Add a lockspace, acquiring a host_id in it. If wait is False the function\n\ -will return immediatly and the status can be checked using inq_lockspace.\n\ +will return immediately and the status can be checked using inq_lockspace.\n\ The iotimeout option configures the io timeout for the specific lockspace,\n\ overriding the default value (see the sanlock daemon parameter -o).");
@@ -983,7 +983,7 @@ PyDoc_STRVAR(pydoc_acquire, "\ acquire(lockspace, resource, disks \ [, slkfd=fd, pid=owner, shared=False, version=None])\n\ Acquire a resource lease for the current process (using the slkfd argument\n\ -to specify the sanlock file descriptor) or for an other process (using the\n\ +to specify the sanlock file descriptor) or for another process (using the\n\ pid argument). If shared is True the resource will be acquired in the shared\n\ mode. The version is the version of the lease that must be acquired or fail.\n\ The disks must be in the format: [(path, offset), ... ]\n"); diff --git a/src/paxos_lease.c b/src/paxos_lease.c index 4850347..ce265e7 100644 --- a/src/paxos_lease.c +++ b/src/paxos_lease.c @@ -2024,8 +2024,8 @@ int paxos_lease_acquire(struct task *task,
if (tmp_leader.lver == next_lver) { /* - * another host has commited a leader_record for next_lver, - * check which inp (owner_id) they commited (possibly us). + * another host has committed a leader_record for next_lver, + * check which inp (owner_id) they committed (possibly us). */
if (tmp_leader.owner_id == token->host_id && @@ -2033,7 +2033,7 @@ int paxos_lease_acquire(struct task *task, /* not a problem, but interesting to see */
log_warnt(token, "paxos_acquire %llu owner is our inp " - "%llu %llu %llu commited by %llu", + "%llu %llu %llu committed by %llu", (unsigned long long)next_lver, (unsigned long long)tmp_leader.owner_id, (unsigned long long)tmp_leader.owner_generation, diff --git a/src/sanlock.8 b/src/sanlock.8 index f33d5be..a9126a4 100644 --- a/src/sanlock.8 +++ b/src/sanlock.8 @@ -112,7 +112,7 @@ host_id, e.g. joining the lockspace with host_id 1 acquires delta lease 1.
.IP [bu] The terms delta lease, lockspace lease, and host_id lease are used -interchangably. +interchangeably.
.IP [bu] sanlock acquires a delta lease by writing the host's unique name to the @@ -168,7 +168,7 @@ by an application.
.IP [bu] sanlock uses paxos leases to implement leases on resources. The terms -paxos lease and resource lease are used interchangably. +paxos lease and resource lease are used interchangeably.
.IP [bu] A paxos lease exists on shared storage and requires 1MB of space. @@ -1055,13 +1055,13 @@ read_ms/write_ms are the milliseconds taken for the renewal read/write ios.
.IP [bu] 2 -next_timeouts are the number of io timeouts that occured +next_timeouts are the number of io timeouts that occurred after the renewal recorded on that line, and before the next successful renewal on the following line.
.IP [bu] 2 next_errors are the number of io errors (not timeouts) that -occured after renewal recorded on that line, and before the +occurred after renewal recorded on that line, and before the next successful renewal on the following line.
.P
sanlock-devel@lists.fedorahosted.org