Skip to content

Commit

Permalink
Fix typos in contrib/
Browse files Browse the repository at this point in the history
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Richard Laager <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Andrea Gelmini <[email protected]>
Closes #9235
  • Loading branch information
Gelma authored and behlendorf committed Aug 30, 2019
1 parent ad0b23b commit cd6b910
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
12 changes: 6 additions & 6 deletions contrib/initramfs/scripts/zfs.in
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ find_rootfs()
{
local pool="$1"

# If 'POOL_IMPORTED' isn't set, no pool imported and therefor
# If 'POOL_IMPORTED' isn't set, no pool imported and therefore
# we won't be able to find a root fs.
[ -z "${POOL_IMPORTED}" ] && return 1

Expand Down Expand Up @@ -135,7 +135,7 @@ get_pools()
# Get the base list of available pools.
available_pools=$(find_pools "$ZPOOL" import)

# Just in case - seen it happen (that a pool isn't visable/found
# Just in case - seen it happen (that a pool isn't visible/found
# with a simple "zpool import" but only when using the "-d"
# option or setting ZPOOL_IMPORT_PATH).
if [ -d "/dev/disk/by-id" ]
Expand Down Expand Up @@ -401,7 +401,7 @@ mount_fs()
return 0
}

# Unlock a ZFS native crypted filesystem.
# Unlock a ZFS native encrypted filesystem.
decrypt_fs()
{
local fs="$1"
Expand Down Expand Up @@ -606,7 +606,7 @@ setup_snapshot_booting()
if ! grep -qiE '(^|[^\\](\\\\)* )(rollback)=(on|yes|1)( |$)' /proc/cmdline
then
# If the destination dataset for the clone
# already exists, destroy it. Recursivly
# already exists, destroy it. Recursively
if [ $(get_fs_value "${rootfs}_${snapname}" type) ]; then
filesystems=$("${ZFS}" list -oname -tfilesystem -H \
-r -Sname "${ZFS_BOOTFS}")
Expand All @@ -616,7 +616,7 @@ setup_snapshot_booting()
fi
fi

# Get all snapshots, recursivly (might need to clone /usr, /var etc
# Get all snapshots, recursively (might need to clone /usr, /var etc
# as well).
for s in $("${ZFS}" list -H -oname -tsnapshot -r "${rootfs}" | \
grep "${snapname}")
Expand Down Expand Up @@ -843,7 +843,7 @@ mountroot()
# Strip 'zfs:' and 'ZFS='.
ZFS_BOOTFS="${ROOT#*[:=]}"

# Stip everything after the first slash.
# Strip everything after the first slash.
ZFS_RPOOL="${ZFS_BOOTFS%%/*}"
fi

Expand Down
2 changes: 1 addition & 1 deletion contrib/pyzfs/docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@

#######################
# Neutralize effects of function wrapping on documented signatures.
# The affected signatures could be explcitly placed into the
# The affected signatures could be explicitly placed into the
# documentation (either in .rst files or as a first line of a
# docstring).
import functools
Expand Down
14 changes: 7 additions & 7 deletions contrib/pyzfs/libzfs_core/_libzfs_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ def lzc_destroy_snaps(snaps, defer):
Typical error is :exc:`SnapshotIsCloned` if `defer` is `False`.
The snapshot names are validated quite loosely and invalid names are
typically ignored as nonexisiting snapshots.
typically ignored as nonexisting snapshots.
A snapshot name referring to a filesystem that doesn't exist is
ignored.
Expand Down Expand Up @@ -470,7 +470,7 @@ def lzc_hold(holds, fd=None):
Holds for snapshots which don't exist will be skipped and have an entry
added to the return value, but will not cause an overall failure.
No exceptions is raised if all holds, for snapshots that existed, were
succesfully created.
successfully created.
Otherwise :exc:`.HoldFailure` exception is raised and no holds will be
created.
:attr:`.HoldFailure.errors` may contain a single element for an error that
Expand Down Expand Up @@ -654,7 +654,7 @@ def lzc_send_space(snapname, fromsnap=None, flags=None):
should be done.
:param fromsnap: the optional starting snapshot name.
If not `None` then an incremental stream size is estimated, otherwise
a full stream is esimated.
a full stream is estimated.
:type fromsnap: `bytes` or `None`
:param flags: the flags that control what enhanced features can be used
in the stream.
Expand Down Expand Up @@ -1178,11 +1178,11 @@ def receive_header(fd):
the type of the dataset for which the stream has been created
(volume, filesystem)
'''
# read sizeof(dmu_replay_record_t) bytes directly into the memort backing
# read sizeof(dmu_replay_record_t) bytes directly into the memory backing
# 'record'
record = _ffi.new("dmu_replay_record_t *")
_ffi.buffer(record)[:] = os.read(fd, _ffi.sizeof(record[0]))
# get drr_begin member and its representation as a Pythn dict
# get drr_begin member and its representation as a Python dict
drr_begin = record.drr_u.drr_begin
header = {}
for field, descr in _ffi.typeof(drr_begin).fields:
Expand Down Expand Up @@ -1688,7 +1688,7 @@ def lzc_set_props(name, prop, val):
# As the extended API is not committed yet, the names of the new interfaces
# are not settled down yet.
# It's not clear if atomically setting multiple properties is an achievable
# goal and an interface acting on mutiple entities must do so atomically
# goal and an interface acting on multiple entities must do so atomically
# by convention.
# Being able to set a single property at a time is sufficient for ClusterHQ.
lzc_set_prop = lzc_set_props
Expand Down Expand Up @@ -1725,7 +1725,7 @@ def lzc_list(name, options):
Absence of this option implies all types.
The first of the returned file descriptors can be used to
read the listing in a binary encounded format. The data is
read the listing in a binary encoded format. The data is
a series of variable sized records each starting with a fixed
size header, the header is followed by a serialized ``nvlist``.
Each record describes a single element and contains the element's
Expand Down
2 changes: 1 addition & 1 deletion contrib/pyzfs/libzfs_core/_nvlist.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def packed_nvlist_out(packed_nvlist, packed_size):
:param bytes packed_nvlist: packed nvlist_t.
:param int packed_size: nvlist_t packed size.
:return: an `dict` of values representing the data containted by nvlist_t.
:return: an `dict` of values representing the data contained by nvlist_t.
:rtype: dict
"""
props = {}
Expand Down
4 changes: 2 additions & 2 deletions contrib/pyzfs/libzfs_core/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def __str__(self):
ZFSError.__str__(self), len(self.errors), self.suppressed_count)

def __repr__(self):
return "%s(%r, %r, errors=%r, supressed=%r)" % (
return "%s(%r, %r, errors=%r, suppressed=%r)" % (
self.__class__.__name__, self.errno, self.message, self.errors,
self.suppressed_count)

Expand Down Expand Up @@ -372,7 +372,7 @@ def __init__(self, name):

class QuotaExceeded(ZFSError):
errno = errno.EDQUOT
message = "Quouta exceeded"
message = "Quota exceeded"

def __init__(self, name):
self.name = name
Expand Down
8 changes: 4 additions & 4 deletions contrib/pyzfs/libzfs_core/test/test_libzfs_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -1913,7 +1913,7 @@ def test_recv_incremental(self):
filecmp.cmp(
os.path.join(mnt1, name), os.path.join(mnt2, name), False))

# This test case fails unless unless a patch from
# This test case fails unless a patch from
# https://clusterhq.atlassian.net/browse/ZFS-20
# is applied to libzfs_core, otherwise it succeeds.
@unittest.skip("fails with unpatched libzfs_core")
Expand Down Expand Up @@ -2160,7 +2160,7 @@ def test_recv_incremental_non_clone_but_set_origin(self):
with streams(srcfs, src1, src2) as (_, (full, incr)):
lzc.lzc_receive(dst1, full.fileno())
lzc.lzc_snapshot([dst_snap])
# becase cannot receive incremental and set origin on a non-clone
# because cannot receive incremental and set origin on a non-clone
with self.assertRaises(lzc_exc.BadStream):
lzc.lzc_receive(dst2, incr.fileno(), origin=dst1)

Expand Down Expand Up @@ -2375,7 +2375,7 @@ def test_force_recv_full_existing_modified_mounted_fs(self):
for i in range(1024):
f.write(b'x' * 1024)
lzc.lzc_receive(dst, stream.fileno(), force=True)
# The temporary file dissappears and any access, even close(),
# The temporary file disappears and any access, even close(),
# results in EIO.
self.assertFalse(os.path.exists(f.name))
with self.assertRaises(IOError):
Expand Down Expand Up @@ -2462,7 +2462,7 @@ def test_force_recv_incremental_modified_mounted_fs(self):
for i in range(1024):
f.write(b'x' * 1024)
lzc.lzc_receive(dst2, incr.fileno(), force=True)
# The temporary file dissappears and any access, even close(),
# The temporary file disappears and any access, even close(),
# results in EIO.
self.assertFalse(os.path.exists(f.name))
with self.assertRaises(IOError):
Expand Down

0 comments on commit cd6b910

Please sign in to comment.