]> git.proxmox.com Git - zfsonlinux.git/blame - zfs-patches/0045-Fix-some-typos.patch
projects / zfsonlinux.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
bump version to 0.7.7-pve1~bpo9
[zfsonlinux.git] / zfs-patches / 0045-Fix-some-typos.patch
CommitLineData
75b07eca
FG		 1From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2From: John Eismeier <32205350+jeis2497052@users.noreply.github.com>
3Date: Wed, 28 Feb 2018 11:57:10 -0500
4Subject: [PATCH] Fix some typos
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
10Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
11Reviewed by: George Melikov <mail@gmelikov.ru>
12Signed-off-by: John Eismeier <john.eismeier@gmail.com>
13Closes #7237
14(cherry picked from commit 33bb1e82568a9734cc3f41d3e1d33003ebf0e123)
15Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
16---
17 cmd/arcstat/arcstat.py | 4 ++--
18 cmd/dbufstat/dbufstat.py | 4 ++--
19 contrib/initramfs/scripts/zfs | 2 +-
20 man/man8/zpool.8 | 2 +-
21 tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh | 4 ++--
22 tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh | 4 ++--
23 tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh | 4 ++--
24 tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh | 4 ++--
25 tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh | 4 ++--
26 tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh | 4 ++--
27 tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh | 4 ++--
28 tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh | 4 ++--
29 tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh | 4 ++--
30 tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh | 4 ++--
31 tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh | 4 ++--
32 tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh | 4 ++--
33 16 files changed, 30 insertions(+), 30 deletions(-)
34
35diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py
36index aa54ee87a..85c83ccc4 100755
37--- a/cmd/arcstat/arcstat.py
38+++ b/cmd/arcstat/arcstat.py
39@@ -280,7 +280,7 @@ def init():
40 "outfile",
41 "help",
42 "verbose",
43- "seperator",
44+ "separator",
45 "columns"
46 ]
47 )
48@@ -299,7 +299,7 @@ def init():
49 hflag = True
50 if opt in ('-v', '--verbose'):
51 vflag = True
52- if opt in ('-s', '--seperator'):
53+ if opt in ('-s', '--separator'):
54 sep = arg
55 i += 1
56 if opt in ('-f', '--columns'):
57diff --git a/cmd/dbufstat/dbufstat.py b/cmd/dbufstat/dbufstat.py
58index dda0a143f..42bb0c7c7 100755
59--- a/cmd/dbufstat/dbufstat.py
60+++ b/cmd/dbufstat/dbufstat.py
61@@ -474,7 +474,7 @@ def main():
62 "help",
63 "infile",
64 "outfile",
65- "seperator",
66+ "separator",
67 "types",
68 "verbose",
69 "extended"
70@@ -499,7 +499,7 @@ def main():
71 ofile = arg
72 if opt in ('-r', '--raw'):
73 raw += 1
74- if opt in ('-s', '--seperator'):
75+ if opt in ('-s', '--separator'):
76 sep = arg
77 if opt in ('-t', '--types'):
78 tflag = True
79diff --git a/contrib/initramfs/scripts/zfs b/contrib/initramfs/scripts/zfs
80index 8770a2e8e..86329e764 100644
81--- a/contrib/initramfs/scripts/zfs
82+++ b/contrib/initramfs/scripts/zfs
83@@ -478,7 +478,7 @@ destroy_fs()
84 echo "Message: $ZFS_STDERR"
85 echo "Error: $ZFS_ERROR"
86 echo ""
87- echo "Failed to destroy '$fs'. Please make sure that '$fs' is not availible."
88+ echo "Failed to destroy '$fs'. Please make sure that '$fs' is not available."
89 echo "Hint: Try: zfs destroy -Rfn $fs"
90 echo "If this dryrun looks good, then remove the 'n' from '-Rfn' and try again."
91 /bin/sh
92diff --git a/man/man8/zpool.8 b/man/man8/zpool.8
93index 7c99f5868..6d7c2271c 100644
94--- a/man/man8/zpool.8
95+++ b/man/man8/zpool.8
96@@ -733,7 +733,7 @@ man page. In order to enable this property each host must set a unique hostid.
97 See
98 .Xr genhostid 1
99 .Xr zgenhostid 8
100-.Xr spl-module-paramters 5
101+.Xr spl-module-parameters 5
102 for additional details. The default value is
103 .Sy off .
104 .It Sy version Ns = Ns Ar version
105diff --git a/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh
106index 4d5fbb9ff..875d2f7c7 100755
107--- a/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh
108+++ b/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh
109@@ -60,7 +60,7 @@ prepare $DNAME "tar cf $TESTDIR/tar$$.tar $BNAME"
110 (( $? != 0 )) && log_fail "Unable to create src archive"
111
112 migrate $TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar"
113-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
114+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
115 "ZFS fs to ZFS fs"
116
117-log_pass "Successully migrated test file from ZFS fs to ZFS fs".
118+log_pass "Successfully migrated test file from ZFS fs to ZFS fs".
119diff --git a/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh
120index e0655248d..6b97e2a40 100755
121--- a/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh
122+++ b/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh
123@@ -60,7 +60,7 @@ prepare $DNAME "tar cf $TESTDIR/tar$$.tar $BNAME"
124 (( $? != 0 )) && log_fail "Unable to create src archive"
125
126 migrate $NONZFS_TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar"
127-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
128+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
129 "ZFS fs to UFS fs"
130
131-log_pass "Successully migrated test file from ZFS fs to UFS fs".
132+log_pass "Successfully migrated test file from ZFS fs to UFS fs".
133diff --git a/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh
134index 904a2b1a0..dd0baeaa9 100755
135--- a/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh
136+++ b/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh
137@@ -60,7 +60,7 @@ prepare $DNAME "tar cf $NONZFS_TESTDIR/tar$$.tar $BNAME"
138 (( $? != 0 )) && log_fail "Unable to create src archive"
139
140 migrate $TESTDIR $SUMA $SUMB "tar xvf $NONZFS_TESTDIR/tar$$.tar"
141-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
142+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
143 "UFS fs to ZFS fs"
144
145-log_pass "Successully migrated test file from UFS fs to ZFS fs".
146+log_pass "Successfully migrated test file from UFS fs to ZFS fs".
147diff --git a/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh
148index 6d33dd5b3..00a6cc172 100755
149--- a/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh
150+++ b/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh
151@@ -67,7 +67,7 @@ cd $cwd
152 (( $? != 0 )) && log_untested "Could not change directory to $cwd"
153
154 migrate_cpio $TESTDIR "$TESTDIR/cpio$$.cpio" $SUMA $SUMB
155-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
156+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
157 "ZFS fs to ZFS fs"
158
159-log_pass "Successully migrated test file from ZFS fs to ZFS fs".
160+log_pass "Successfully migrated test file from ZFS fs to ZFS fs".
161diff --git a/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh
162index a41b19b5f..4386596f7 100755
163--- a/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh
164+++ b/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh
165@@ -67,7 +67,7 @@ cd $cwd
166 (( $? != 0 )) && log_untested "Could not change directory to $cwd"
167
168 migrate_cpio $NONZFS_TESTDIR "$TESTDIR/cpio$$.cpio" $SUMA $SUMB
169-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
170+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
171 "ZFS fs to UFS fs"
172
173-log_pass "Successully migrated test file from ZFS fs to UFS fs".
174+log_pass "Successfully migrated test file from ZFS fs to UFS fs".
175diff --git a/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh
176index 5b444421a..9b5c9166e 100755
177--- a/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh
178+++ b/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh
179@@ -67,7 +67,7 @@ cd $cwd
180 (( $? != 0 )) && log_untested "Could not change directory to $cwd"
181
182 migrate_cpio $TESTDIR "$NONZFS_TESTDIR/cpio$$.cpio" $SUMA $SUMB
183-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
184+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
185 "ZFS fs to ZFS fs"
186
187-log_pass "Successully migrated test file from UFS fs to ZFS fs".
188+log_pass "Successfully migrated test file from UFS fs to ZFS fs".
189diff --git a/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh
190index c3197052c..0d136550f 100755
191--- a/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh
192+++ b/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh
193@@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$TESTDIR/dd$$.dd"
194 (( $? != 0 )) && log_fail "Unable to create src archive"
195
196 migrate $TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME"
197-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
198+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
199 "ZFS fs to ZFS fs"
200
201-log_pass "Successully migrated test file from ZFS fs to ZFS fs".
202+log_pass "Successfully migrated test file from ZFS fs to ZFS fs".
203diff --git a/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh
204index 2e51eef36..f62b1f33a 100755
205--- a/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh
206+++ b/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh
207@@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$TESTDIR/dd$$.dd"
208 (( $? != 0 )) && log_fail "Unable to create src archive"
209
210 migrate $NONZFS_TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME"
211-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
212+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
213 "ZFS fs to ZFS fs"
214
215-log_pass "Successully migrated test file from ZFS fs to UFS fs".
216+log_pass "Successfully migrated test file from ZFS fs to UFS fs".
217diff --git a/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh
218index 7749494e5..907be39eb 100755
219--- a/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh
220+++ b/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh
221@@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$NONZFS_TESTDIR/dd$$.dd"
222 (( $? != 0 )) && log_fail "Unable to create src archive"
223
224 migrate $TESTDIR $SUMA $SUMB "dd if=$NONZFS_TESTDIR/dd$$.dd obs=128k of=$BNAME"
225-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
226+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
227 "ZFS fs to ZFS fs"
228
229-log_pass "Successully migrated test file from UFS fs to ZFS fs".
230+log_pass "Successfully migrated test file from UFS fs to ZFS fs".
231diff --git a/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh
232index a11ab72df..e80dd67cd 100755
233--- a/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh
234+++ b/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh
235@@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $TESTDIR/cp$$.cp"
236 (( $? != 0 )) && log_fail "Unable to create src archive"
237
238 migrate $TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME"
239-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
240+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
241 "ZFS fs to ZFS fs"
242
243-log_pass "Successully migrated test file from ZFS fs to ZFS fs".
244+log_pass "Successfully migrated test file from ZFS fs to ZFS fs".
245diff --git a/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh
246index 17e1c78f9..2d7ecb45e 100755
247--- a/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh
248+++ b/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh
249@@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $TESTDIR/cp$$.cp"
250 (( $? != 0 )) && log_fail "Unable to create src archive"
251
252 migrate $NONZFS_TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME"
253-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
254+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
255 "ZFS fs to UFS fs"
256
257-log_pass "Successully migrated test file from ZFS fs to UFS fs".
258+log_pass "Successfully migrated test file from ZFS fs to UFS fs".
259diff --git a/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh
260index 823dabeae..fd9c45491 100755
261--- a/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh
262+++ b/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh
263@@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $NONZFS_TESTDIR/cp$$.cp"
264 (( $? != 0 )) && log_fail "Unable to create src archive"
265
266 migrate $TESTDIR $SUMA $SUMB "cp $NONZFS_TESTDIR/cp$$.cp $BNAME"
267-(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
268+(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
269 "UFS fs to ZFS fs"
270
271-log_pass "Successully migrated test file from UFS fs to ZFS fs".
272+log_pass "Successfully migrated test file from UFS fs to ZFS fs".
273--
2742.14.2
275
ZFS on Linux kernel module and userland packages for Proxmox projects