From: Colin Ian King colin.king@canonical.com

mainline inclusion from mainline-v5.15 commit f8d87ed9f0d546ac5b05e8e7d2b148d4b77599fa category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4G67J?from=project-issue CVE: NA

----------------------------------------------------------------------

There is a spelling mistake in a ntfs_err error message. Also fix various spelling mistakes in comments.

Signed-off-by: Colin Ian King colin.king@canonical.com Reviewed-by: Kari Argillander kari.argillander@gmail.com Signed-off-by: Konstantin Komarov almaz.alexandrovich@paragon-software.com Signed-off-by: Yin Xiujiang yinxiujiang@kylinos.cn --- fs/ntfs3/debug.h | 2 +- fs/ntfs3/lib/decompress_common.c | 2 +- fs/ntfs3/run.c | 2 +- fs/ntfs3/super.c | 4 ++-- fs/ntfs3/upcase.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/ntfs3/debug.h b/fs/ntfs3/debug.h index dfaa4c79dc6d..15ac42185e5b 100644 --- a/fs/ntfs3/debug.h +++ b/fs/ntfs3/debug.h @@ -3,7 +3,7 @@ * * Copyright (C) 2019-2021 Paragon Software GmbH, All rights reserved. * - * useful functions for debuging + * useful functions for debugging */

// clang-format off diff --git a/fs/ntfs3/lib/decompress_common.c b/fs/ntfs3/lib/decompress_common.c index 83c9e93aea77..850d8e8c8f1f 100644 --- a/fs/ntfs3/lib/decompress_common.c +++ b/fs/ntfs3/lib/decompress_common.c @@ -292,7 +292,7 @@ int make_huffman_decode_table(u16 decode_table[], const u32 num_syms, * of as simply the root of the tree. The * representation of these internal nodes is * simply the index of the left child combined - * with the special bits 0xC000 to distingush + * with the special bits 0xC000 to distinguish * the entry from direct mapping and leaf node * entries. */ diff --git a/fs/ntfs3/run.c b/fs/ntfs3/run.c index 5cdf6efe67e0..f9c362ac672e 100644 --- a/fs/ntfs3/run.c +++ b/fs/ntfs3/run.c @@ -949,7 +949,7 @@ int run_unpack(struct runs_tree *run, struct ntfs_sb_info *sbi, CLST ino, if (next_vcn > 0x100000000ull || (lcn + len) > 0x100000000ull) { ntfs_err( sbi->sb, - "This driver is compiled whitout CONFIG_NTFS3_64BIT_CLUSTER (like windows driver).\n" + "This driver is compiled without CONFIG_NTFS3_64BIT_CLUSTER (like windows driver).\n" "Volume contains 64 bits run: vcn %llx, lcn %llx, len %llx.\n" "Activate CONFIG_NTFS3_64BIT_CLUSTER to process this case", vcn64, lcn, len); diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c index 6be13e256c1a..84d4f389f685 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -124,7 +124,7 @@ void ntfs_inode_printk(struct inode *inode, const char *fmt, ...) /* * Shared memory struct. * - * on-disk ntfs's upcase table is created by ntfs formater + * on-disk ntfs's upcase table is created by ntfs formatter * 'upcase' table is 128K bytes of memory * we should read it into memory when mounting * Several ntfs volumes likely use the same 'upcase' table @@ -1208,7 +1208,7 @@ static int ntfs_fill_super(struct super_block *sb, void *data, int silent) sbi->def_entries = 1; done = sizeof(struct ATTR_DEF_ENTRY); sbi->reparse.max_size = MAXIMUM_REPARSE_DATA_BUFFER_SIZE; - sbi->ea_max_size = 0x10000; /* default formater value */ + sbi->ea_max_size = 0x10000; /* default formatter value */

while (done + sizeof(struct ATTR_DEF_ENTRY) <= bytes) { u32 t32 = le32_to_cpu(t->type); diff --git a/fs/ntfs3/upcase.c b/fs/ntfs3/upcase.c index 9617382aca64..b53943538f9f 100644 --- a/fs/ntfs3/upcase.c +++ b/fs/ntfs3/upcase.c @@ -27,7 +27,7 @@ static inline u16 upcase_unicode_char(const u16 *upcase, u16 chr) /* * Thanks Kari Argillander kari.argillander@gmail.com for idea and implementation 'bothcase' * - * Straigth way to compare names: + * Straight way to compare names: * - case insensitive * - if name equals and 'bothcases' then * - case sensitive