[PATCH 4/4] nilfs-utils: fix typos in source files

[Ryusuke Konishi]

Fix typos in source files of mkfs.nilfs2, nilfs_cleanerd,
mount.nilfs2, nilfs-clean, include/nilfs.h, and lib/gc.c.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke-***@public.gmane.org>
---
include/nilfs.h | 4 ++--
lib/gc.c | 2 +-
sbin/cleanerd/cleanerd.c | 8 ++++----
sbin/mkfs/bitops.c | 2 +-
sbin/mkfs/mkfs.c | 4 ++--
sbin/mount/mount_opts.h | 2 +-
sbin/nilfs-clean/nilfs-clean.c | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/nilfs.h b/include/nilfs.h
index fab8ff2..f695f48 100644
--- a/include/nilfs.h
+++ b/include/nilfs.h
@@ -191,7 +191,7 @@ struct nilfs_psegment {
* struct nilfs_file - file iterator
* @f_finfo: file information
* @f_blocknr: block number
- * @f_offset: byte offset from the begining of segment
+ * @f_offset: byte offset from the beginning of segment
* @f_index: index
* @f_psegment: partial segment
*/
@@ -208,7 +208,7 @@ struct nilfs_file {
* struct nilfs_block - block iterator
* @b_binfo: block information
* @b_blocknr: block number
- * @b_offset: byte offset from the begining of segment
+ * @b_offset: byte offset from the beginning of segment
* @b_index: index
* @b_dsize: size of data block information
* @b_nsize: size of node block information
diff --git a/lib/gc.c b/lib/gc.c
index bb644c4..54d0b66 100644
--- a/lib/gc.c
+++ b/lib/gc.c
@@ -480,7 +480,7 @@ static int nilfs_toss_vdescs(struct nilfs *nilfs,
break;

/*
- * Add the virtual block number to the canditate
+ * Add the virtual block number to the candidate
* for deletion.
*/
vblocknrp = nilfs_vector_get_new_element(vblocknrv);
diff --git a/sbin/cleanerd/cleanerd.c b/sbin/cleanerd/cleanerd.c
index 17de87b..d37bd5c 100644
--- a/sbin/cleanerd/cleanerd.c
+++ b/sbin/cleanerd/cleanerd.c
@@ -125,7 +125,7 @@ static const struct option long_option[] = {
* @fallback: fallback state
* @retry_cleaning: retrying reclamation for protected segments
* @no_timeout: the next timeout will be 0 seconds
- * @ncleansegs: number of semgents cleaned per cycle
+ * @ncleansegs: number of segments cleaned per cycle
* @cleaning_interval: cleaning interval
* @target: target time for sleeping
* @timeout: timeout value for sleeping
@@ -138,9 +138,9 @@ static const struct option long_option[] = {
* @pending_cmd: pending client command
* @jobid: current job id
* @mm_prev_state: previous status during suspending
- * @mm_nrestpasses: remaiing number of passes
+ * @mm_nrestpasses: remaining number of passes
* @mm_nrestsegs: remaining number of segment (1-pass)
- * @mm_ncleansegs: number of segmetns cleaned per cycle (manual mode)
+ * @mm_ncleansegs: number of segments cleaned per cycle (manual mode)
* @mm_protection_period: protection period (manual mode)
* @mm_cleaning_interval: cleaning interval (manual mode)
* @mm_min_reclaimable_blocks: min. number of reclaimable blocks (manual mode)
@@ -190,7 +190,7 @@ static volatile unsigned long protection_period;

/* global variables */
static struct nilfs_cleanerd *nilfs_cleanerd;
-static sigjmp_buf nilfs_cleanerd_env; /* for siglongjume */
+static sigjmp_buf nilfs_cleanerd_env; /* for siglongjmp */
static volatile sig_atomic_t nilfs_cleanerd_reload_config; /* reload flag */
static char nilfs_cleanerd_msgbuf[NILFS_CLEANER_MSG_MAX_REQSZ];

diff --git a/sbin/mkfs/bitops.c b/sbin/mkfs/bitops.c
index 6262884..a649def 100644
--- a/sbin/mkfs/bitops.c
+++ b/sbin/mkfs/bitops.c
@@ -9,7 +9,7 @@
/*
* For the benefit of those who are trying to port Linux to another
* architecture, here are some C-language equivalents. You should
- * recode these in the native assmebly language, if at all possible.
+ * recode these in the native assembly language, if at all possible.
*
* C language equivalents written by Theodore Ts'o, 9/26/92.
* Modified by Pete A. Zaitcev 7/14/95 to be portable to big endian
diff --git a/sbin/mkfs/mkfs.c b/sbin/mkfs/mkfs.c
index c122375..c7e18c6 100644
--- a/sbin/mkfs/mkfs.c
+++ b/sbin/mkfs/mkfs.c
@@ -137,7 +137,7 @@ static void parse_options(int argc, char *argv[]);
* ^
* sb->s_first_data_block
*
- * Intial layout of ifile and DAT file:
+ * Initial layout of ifile and DAT file:
*
* blk +0 +1 +2
* +------------------+--------+---------+
@@ -1388,7 +1388,7 @@ static inline void
alloc_blockgrouped_file_entry(blocknr_t blocknr, unsigned long nr)
{
struct nilfs_palloc_group_desc *desc = map_disk_buffer(blocknr, 1);
- /* allways use the first group */
+ /* always use the first group */
void *bitmap = map_disk_buffer(blocknr + 1, 1);

if (nilfs_test_bit(nr, bitmap))
diff --git a/sbin/mount/mount_opts.h b/sbin/mount/mount_opts.h
index cce3856..00e6958 100644
--- a/sbin/mount/mount_opts.h
+++ b/sbin/mount/mount_opts.h
@@ -59,7 +59,7 @@ char *replace_optval(char *s, const char *fmt, void *varp, ...);
* @fmt. If replacement or removal occurs, old @str is automatically
* freed.
*
- * Return Value: new options string is retured.
+ * Return Value: new options string is returned.
*/
#define replace_drop_opt(str, fmt, oldvalp, newval, cond) \
({ \
diff --git a/sbin/nilfs-clean/nilfs-clean.c b/sbin/nilfs-clean/nilfs-clean.c
index e1446bd..1f4c8f0 100644
--- a/sbin/nilfs-clean/nilfs-clean.c
+++ b/sbin/nilfs-clean/nilfs-clean.c
@@ -1,5 +1,5 @@
/*
- * nilfs-clean.c - run garbage colletor for nilfs2 volume
+ * nilfs-clean.c - run garbage collector for nilfs2 volume
*
* Licensed under GPLv2: the complete text of the GNU General Public License
* can be found in COPYING file of the nilfs-utils package.

[Ryusuke Konishi]

Fix typos in messages of nilfs-resize command, lssu command, and
libnilfsgc.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke-***@public.gmane.org>
---
bin/lssu.c | 2 +-
lib/gc.c | 2 +-
sbin/nilfs-resize/nilfs-resize.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/lssu.c b/bin/lssu.c
index 5f501b1..ebbd926 100644
--- a/bin/lssu.c
+++ b/bin/lssu.c
@@ -290,7 +290,7 @@ static int lssu_get_protcno(struct nilfs *nilfs,
ret = nilfs_cnoconv_time2cno(cnoconv, *prottimep, protcnop);
if (ret < 0) {
fprintf(stderr,
- "%s: cannot convert protectoin time to checkpoint "
+ "%s: cannot convert protection time to checkpoint "
"number: %m\n",
progname);
}
diff --git a/lib/gc.c b/lib/gc.c
index 453acf2..bb644c4 100644
--- a/lib/gc.c
+++ b/lib/gc.c
@@ -360,7 +360,7 @@ static ssize_t nilfs_get_snapshot(struct nilfs *nilfs, nilfs_cno_t **ssp)
nilfs_gc_logger
(LOG_ERR,
"broken snapshot information. "
- "snapshot numbers apeared in a "
+ "snapshot numbers appeared in a "
"non-ascending order: %llu >= %llu",
(unsigned long long)prev,
(unsigned long long)ss[i + j]);
diff --git a/sbin/nilfs-resize/nilfs-resize.c b/sbin/nilfs-resize/nilfs-resize.c
index c7ed910..d605e59 100644
--- a/sbin/nilfs-resize/nilfs-resize.c
+++ b/sbin/nilfs-resize/nilfs-resize.c
@@ -1186,7 +1186,7 @@ int main(int argc, char *argv[])
unsigned long long size2;

size2 = size & ~(sector_size - 1);
- myprintf("size %llu is not alinged to sector " \
+ myprintf("size %llu is not aligned to sector " \
"size. truncated to %llu.\n",
size, size2);
size = size2;

[Ryusuke Konishi]

Signed-off-by: Ryusuke Konishi <konishi.ryusuke-***@public.gmane.org>
---
ChangeLog | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fde4126..e4082dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,12 +8,12 @@ nilfs-utils-2.2.0 Tue Apr 8, 2014 JST
* lib/gc.c: add optimized version of nilfs_xreclaim_segments
* cleanerd: use nilfs_xreclaim_segment()
* cleanerd: add a no_timeout flag to enable faster loop
- * lib/nilfs.c: add suport for NILFS_IOCTL_SET_SUINFO ioctl
+ * lib/nilfs.c: add support for NILFS_IOCTL_SET_SUINFO ioctl
* lib/nilfs.c: add NILFS_OPT_SET_SUINFO
* nilfs-clean: add cmdline param min-reclaimable-blocks
* move generic macros into util.h
* fix coding style issues
- * bump up verion of nilfs-utils written in manpages
+ * bump up version of nilfs-utils written in manpages

nilfs-utils-2.1.6 Sun Jan 26, 2014 JST

@@ -43,7 +43,7 @@ nilfs-utils-2.1.5 Thu May 2, 2013 JST
* mkfs.nilfs2: erase the first and the second sectors unless boot
sector exists.
* mkcp: add --print option.
- * add ommitted comments for structures in nilfs2_fs.h.
+ * add omitted comments for structures in nilfs2_fs.h.
* add autogen script.
* fix missing bold font termination in nilfs.8 man page.
* update README file.
@@ -207,7 +207,7 @@ nilfs-utils-2.0.17 Sat Mar 13, 2010 JST

nilfs-utils-2.0.16 Sat Mar 13, 2010 JST

- * add pseudo mount option "-o pp=<secconds>" which sets protection
+ * add pseudo mount option "-o pp=<seconds>" which sets protection
period (thanks to David Smid)
* fix build against newer glibc
* update mount.nilfs2 manpage to reflect mount option changes
@@ -258,7 +258,7 @@ nilfs-utils-2.0.12 Thu Apr 2, 2009 JST
* fix command line buffer overflow error for mkfs -c
* settle mess for bind mounts.
* fix a bug in device check of mount.nilfs2 which confirm device is
- acesssible or not.
+ accessible or not.
* rewrite lscp command to interleavingly call nilfs_get_cpinfo()
and list its result.
* rewrite lssu command to interleavingly call nilfs_get_suinfo()

[Ryusuke Konishi]

Fix typos in man/mount.nilfs2.8 and man/nilfs-resize.8.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke-***@public.gmane.org>
---
man/mount.nilfs2.8 | 4 ++--
man/nilfs-resize.8 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/mount.nilfs2.8 b/man/mount.nilfs2.8
index 37474e9..8f0115e 100644
--- a/man/mount.nilfs2.8
+++ b/man/mount.nilfs2.8
@@ -37,7 +37,7 @@ the \fI/etc/fstab\fP table.
The third form, which directly invokes \fBmount.nilfs2\fP, is also
usable since \fBmount.nilfs2\fP maintains by itself the system mount
state such as the list of mounted file systems described in
-\fI/etc/mtab\fP. Howerver, the first or the second form is usually
+\fI/etc/mtab\fP. However, the first or the second form is usually
recommended because some expansive options are not supported by the
third form.
.SH OPTIONS
@@ -103,7 +103,7 @@ checkpoints marked as snapshot are mountable with this option. Note
that the read-only mount option must be specified together.
.TP
.BR errors=continue " / " errors=remount-ro " / " errors=panic
-Define the behaviour when an error is encountered. (Eigher ignore
+Define the behaviour when an error is encountered. (Either ignore
errors and just mark the file system erroneous and continue, or
remount the file system read-only, or panic and halt the system.) The
default is remount-ro. In earlier kernels than Linux 2.6.35, continue
diff --git a/man/nilfs-resize.8 b/man/nilfs-resize.8
index 99ed930..b05982e 100644
--- a/man/nilfs-resize.8
+++ b/man/nilfs-resize.8
@@ -19,7 +19,7 @@ filesystem. The \fIsize\fP of the filesystem may never be larger than
the size of the partition. Optionally, the \fIsize\fP parameter may
be suffixed by one of the following units designators: \'s\',
\'K\', \'M\', \'G\', or \'T\', for 512 byte sectors, kilobytes,
-magabytes, gigabytes, or terabytes, respectively. If \fIsize\fP
+megabytes, gigabytes, or terabytes, respectively. If \fIsize\fP
parameter is not specified, it will default to the size of the
partition.
.PP