2021-04-08 14:11:39

by Lu Jialin

[permalink] [raw]
Subject: [PATCH -next] nilfs2: Fix typos in comments

numer -> number in fs/nilfs2/cpfile.c and fs/nilfs2/segment.c
retured -> returned and Decription -> Description in fs/nilfs2/ioctl.c
isntance -> instance in fs/nilfs2/the_nilfs.c
No functionality changed.

Signed-off-by: Lu Jialin <[email protected]>
---
fs/nilfs2/cpfile.c | 2 +-
fs/nilfs2/ioctl.c | 6 +++---
fs/nilfs2/segment.c | 4 ++--
fs/nilfs2/the_nilfs.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
index 025fb082575a..ce144776b4ef 100644
--- a/fs/nilfs2/cpfile.c
+++ b/fs/nilfs2/cpfile.c
@@ -293,7 +293,7 @@ void nilfs_cpfile_put_checkpoint(struct inode *cpfile, __u64 cno,
* nilfs_cpfile_delete_checkpoints - delete checkpoints
* @cpfile: inode of checkpoint file
* @start: start checkpoint number
- * @end: end checkpoint numer
+ * @end: end checkpoint number
*
* Description: nilfs_cpfile_delete_checkpoints() deletes the checkpoints in
* the period from @start to @end, excluding @end itself. The checkpoints
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index b053b40315bf..cbb59a6c4b81 100644
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -979,7 +979,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
* and metadata are written out to the device when it successfully
* returned.
*
- * Return Value: On success, 0 is retured. On errors, one of the following
+ * Return Value: On success, 0 is returned. On errors, one of the following
* negative error code is returned.
*
* %-EROFS - Read only filesystem.
@@ -1058,7 +1058,7 @@ static int nilfs_ioctl_resize(struct inode *inode, struct file *filp,
* @inode: inode object
* @argp: pointer on argument from userspace
*
- * Decription: nilfs_ioctl_trim_fs is the FITRIM ioctl handle function. It
+ * Description: nilfs_ioctl_trim_fs is the FITRIM ioctl handle function. It
* checks the arguments from userspace and calls nilfs_sufile_trim_fs, which
* performs the actual trim operation.
*
@@ -1100,7 +1100,7 @@ static int nilfs_ioctl_trim_fs(struct inode *inode, void __user *argp)
* @inode: inode object
* @argp: pointer on argument from userspace
*
- * Decription: nilfs_ioctl_set_alloc_range() function defines lower limit
+ * Description: nilfs_ioctl_set_alloc_range() function defines lower limit
* of segments in bytes and upper limit of segments in bytes.
* The NILFS_IOCTL_SET_ALLOC_RANGE is used by nilfs_resize utility.
*
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index cd4da9535aed..686c8ee7b29c 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -2214,7 +2214,7 @@ static void nilfs_segctor_wakeup(struct nilfs_sc_info *sci, int err)
* nilfs_construct_segment - construct a logical segment
* @sb: super block
*
- * Return Value: On success, 0 is retured. On errors, one of the following
+ * Return Value: On success, 0 is returned. On errors, one of the following
* negative error code is returned.
*
* %-EROFS - Read only filesystem.
@@ -2251,7 +2251,7 @@ int nilfs_construct_segment(struct super_block *sb)
* @start: start byte offset
* @end: end byte offset (inclusive)
*
- * Return Value: On success, 0 is retured. On errors, one of the following
+ * Return Value: On success, 0 is returned. On errors, one of the following
* negative error code is returned.
*
* %-EROFS - Read only filesystem.
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 221a1cc597f0..8b7b01a380ce 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -195,7 +195,7 @@ static int nilfs_store_log_cursor(struct the_nilfs *nilfs,
/**
* load_nilfs - load and recover the nilfs
* @nilfs: the_nilfs structure to be released
- * @sb: super block isntance used to recover past segment
+ * @sb: super block instance used to recover past segment
*
* load_nilfs() searches and load the latest super root,
* attaches the last segment, and does recovery if needed.
--
2.17.1


2021-04-08 15:37:12

by Ryusuke Konishi

[permalink] [raw]
Subject: Re: [PATCH -next] nilfs2: Fix typos in comments

Hi,

This patch partially overlaps the following fix that I previously sent to
Andrew:

https://lkml.org/lkml/2021/4/8/114

Can you exclude two typo fixes of "retured -> returned" from yours ?

Thanks,
Ryusuke Konishi

On Thu, Apr 8, 2021 at 11:08 PM Lu Jialin <[email protected]> wrote:
>
> numer -> number in fs/nilfs2/cpfile.c and fs/nilfs2/segment.c
> retured -> returned and Decription -> Description in fs/nilfs2/ioctl.c
> isntance -> instance in fs/nilfs2/the_nilfs.c
> No functionality changed.
>
> Signed-off-by: Lu Jialin <[email protected]>
> ---
> fs/nilfs2/cpfile.c | 2 +-
> fs/nilfs2/ioctl.c | 6 +++---
> fs/nilfs2/segment.c | 4 ++--
> fs/nilfs2/the_nilfs.c | 2 +-
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
> index 025fb082575a..ce144776b4ef 100644
> --- a/fs/nilfs2/cpfile.c
> +++ b/fs/nilfs2/cpfile.c
> @@ -293,7 +293,7 @@ void nilfs_cpfile_put_checkpoint(struct inode *cpfile, __u64 cno,
> * nilfs_cpfile_delete_checkpoints - delete checkpoints
> * @cpfile: inode of checkpoint file
> * @start: start checkpoint number
> - * @end: end checkpoint numer
> + * @end: end checkpoint number
> *
> * Description: nilfs_cpfile_delete_checkpoints() deletes the checkpoints in
> * the period from @start to @end, excluding @end itself. The checkpoints
> diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
> index b053b40315bf..cbb59a6c4b81 100644
> --- a/fs/nilfs2/ioctl.c
> +++ b/fs/nilfs2/ioctl.c
> @@ -979,7 +979,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
> * and metadata are written out to the device when it successfully
> * returned.
> *
> - * Return Value: On success, 0 is retured. On errors, one of the following
> + * Return Value: On success, 0 is returned. On errors, one of the following
> * negative error code is returned.
> *
> * %-EROFS - Read only filesystem.
> @@ -1058,7 +1058,7 @@ static int nilfs_ioctl_resize(struct inode *inode, struct file *filp,
> * @inode: inode object
> * @argp: pointer on argument from userspace
> *
> - * Decription: nilfs_ioctl_trim_fs is the FITRIM ioctl handle function. It
> + * Description: nilfs_ioctl_trim_fs is the FITRIM ioctl handle function. It
> * checks the arguments from userspace and calls nilfs_sufile_trim_fs, which
> * performs the actual trim operation.
> *
> @@ -1100,7 +1100,7 @@ static int nilfs_ioctl_trim_fs(struct inode *inode, void __user *argp)
> * @inode: inode object
> * @argp: pointer on argument from userspace
> *
> - * Decription: nilfs_ioctl_set_alloc_range() function defines lower limit
> + * Description: nilfs_ioctl_set_alloc_range() function defines lower limit
> * of segments in bytes and upper limit of segments in bytes.
> * The NILFS_IOCTL_SET_ALLOC_RANGE is used by nilfs_resize utility.
> *
> diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
> index cd4da9535aed..686c8ee7b29c 100644
> --- a/fs/nilfs2/segment.c
> +++ b/fs/nilfs2/segment.c
> @@ -2214,7 +2214,7 @@ static void nilfs_segctor_wakeup(struct nilfs_sc_info *sci, int err)
> * nilfs_construct_segment - construct a logical segment
> * @sb: super block
> *
> - * Return Value: On success, 0 is retured. On errors, one of the following
> + * Return Value: On success, 0 is returned. On errors, one of the following
> * negative error code is returned.
> *
> * %-EROFS - Read only filesystem.
> @@ -2251,7 +2251,7 @@ int nilfs_construct_segment(struct super_block *sb)
> * @start: start byte offset
> * @end: end byte offset (inclusive)
> *
> - * Return Value: On success, 0 is retured. On errors, one of the following
> + * Return Value: On success, 0 is returned. On errors, one of the following
> * negative error code is returned.
> *
> * %-EROFS - Read only filesystem.
> diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
> index 221a1cc597f0..8b7b01a380ce 100644
> --- a/fs/nilfs2/the_nilfs.c
> +++ b/fs/nilfs2/the_nilfs.c
> @@ -195,7 +195,7 @@ static int nilfs_store_log_cursor(struct the_nilfs *nilfs,
> /**
> * load_nilfs - load and recover the nilfs
> * @nilfs: the_nilfs structure to be released
> - * @sb: super block isntance used to recover past segment
> + * @sb: super block instance used to recover past segment
> *
> * load_nilfs() searches and load the latest super root,
> * attaches the last segment, and does recovery if needed.
> --
> 2.17.1
>

2021-04-09 01:54:09

by Lu Jialin

[permalink] [raw]
Subject: Re: [PATCH -next] nilfs2: Fix typos in comments

Thanks for reviewing, I will exclude it in v2 patch and send out later.

在 2021/4/8 23:35, Ryusuke Konishi 写道:
> Hi,
>
> This patch partially overlaps the following fix that I previously sent to
> Andrew:
>
> https://lkml.org/lkml/2021/4/8/114
>
> Can you exclude two typo fixes of "retured -> returned" from yours ?
>
> Thanks,
> Ryusuke Konishi
>
> On Thu, Apr 8, 2021 at 11:08 PM Lu Jialin <[email protected]> wrote:
>> numer -> number in fs/nilfs2/cpfile.c and fs/nilfs2/segment.c
>> retured -> returned and Decription -> Description in fs/nilfs2/ioctl.c
>> isntance -> instance in fs/nilfs2/the_nilfs.c
>> No functionality changed.
>>
>> Signed-off-by: Lu Jialin <[email protected]>
>> ---
>> fs/nilfs2/cpfile.c | 2 +-
>> fs/nilfs2/ioctl.c | 6 +++---
>> fs/nilfs2/segment.c | 4 ++--
>> fs/nilfs2/the_nilfs.c | 2 +-
>> 4 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
>> index 025fb082575a..ce144776b4ef 100644
>> --- a/fs/nilfs2/cpfile.c
>> +++ b/fs/nilfs2/cpfile.c
>> @@ -293,7 +293,7 @@ void nilfs_cpfile_put_checkpoint(struct inode *cpfile, __u64 cno,
>> * nilfs_cpfile_delete_checkpoints - delete checkpoints
>> * @cpfile: inode of checkpoint file
>> * @start: start checkpoint number
>> - * @end: end checkpoint numer
>> + * @end: end checkpoint number
>> *
>> * Description: nilfs_cpfile_delete_checkpoints() deletes the checkpoints in
>> * the period from @start to @end, excluding @end itself. The checkpoints
>> diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
>> index b053b40315bf..cbb59a6c4b81 100644
>> --- a/fs/nilfs2/ioctl.c
>> +++ b/fs/nilfs2/ioctl.c
>> @@ -979,7 +979,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
>> * and metadata are written out to the device when it successfully
>> * returned.
>> *
>> - * Return Value: On success, 0 is retured. On errors, one of the following
>> + * Return Value: On success, 0 is returned. On errors, one of the following
>> * negative error code is returned.
>> *
>> * %-EROFS - Read only filesystem.
>> @@ -1058,7 +1058,7 @@ static int nilfs_ioctl_resize(struct inode *inode, struct file *filp,
>> * @inode: inode object
>> * @argp: pointer on argument from userspace
>> *
>> - * Decription: nilfs_ioctl_trim_fs is the FITRIM ioctl handle function. It
>> + * Description: nilfs_ioctl_trim_fs is the FITRIM ioctl handle function. It
>> * checks the arguments from userspace and calls nilfs_sufile_trim_fs, which
>> * performs the actual trim operation.
>> *
>> @@ -1100,7 +1100,7 @@ static int nilfs_ioctl_trim_fs(struct inode *inode, void __user *argp)
>> * @inode: inode object
>> * @argp: pointer on argument from userspace
>> *
>> - * Decription: nilfs_ioctl_set_alloc_range() function defines lower limit
>> + * Description: nilfs_ioctl_set_alloc_range() function defines lower limit
>> * of segments in bytes and upper limit of segments in bytes.
>> * The NILFS_IOCTL_SET_ALLOC_RANGE is used by nilfs_resize utility.
>> *
>> diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
>> index cd4da9535aed..686c8ee7b29c 100644
>> --- a/fs/nilfs2/segment.c
>> +++ b/fs/nilfs2/segment.c
>> @@ -2214,7 +2214,7 @@ static void nilfs_segctor_wakeup(struct nilfs_sc_info *sci, int err)
>> * nilfs_construct_segment - construct a logical segment
>> * @sb: super block
>> *
>> - * Return Value: On success, 0 is retured. On errors, one of the following
>> + * Return Value: On success, 0 is returned. On errors, one of the following
>> * negative error code is returned.
>> *
>> * %-EROFS - Read only filesystem.
>> @@ -2251,7 +2251,7 @@ int nilfs_construct_segment(struct super_block *sb)
>> * @start: start byte offset
>> * @end: end byte offset (inclusive)
>> *
>> - * Return Value: On success, 0 is retured. On errors, one of the following
>> + * Return Value: On success, 0 is returned. On errors, one of the following
>> * negative error code is returned.
>> *
>> * %-EROFS - Read only filesystem.
>> diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
>> index 221a1cc597f0..8b7b01a380ce 100644
>> --- a/fs/nilfs2/the_nilfs.c
>> +++ b/fs/nilfs2/the_nilfs.c
>> @@ -195,7 +195,7 @@ static int nilfs_store_log_cursor(struct the_nilfs *nilfs,
>> /**
>> * load_nilfs - load and recover the nilfs
>> * @nilfs: the_nilfs structure to be released
>> - * @sb: super block isntance used to recover past segment
>> + * @sb: super block instance used to recover past segment
>> *
>> * load_nilfs() searches and load the latest super root,
>> * attaches the last segment, and does recovery if needed.
>> --
>> 2.17.1
>>
> .

2021-04-09 02:27:45

by Lu Jialin

[permalink] [raw]
Subject: [PATCH v2 -next] nilfs2: Fix typos in comments

numer -> number in fs/nilfs2/cpfile.c
Decription -> Description in fs/nilfs2/ioctl.c
isntance -> instance in fs/nilfs2/the_nilfs.c

Signed-off-by: Lu Jialin <[email protected]>
---
v2:
Exclude two typo fixes of "retured -> returned", which has been fixed in
previous patch.
fs/nilfs2/cpfile.c | 2 +-
fs/nilfs2/ioctl.c | 4 ++--
fs/nilfs2/the_nilfs.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
index 025fb082575a..ce144776b4ef 100644
--- a/fs/nilfs2/cpfile.c
+++ b/fs/nilfs2/cpfile.c
@@ -293,7 +293,7 @@ void nilfs_cpfile_put_checkpoint(struct inode *cpfile, __u64 cno,
* nilfs_cpfile_delete_checkpoints - delete checkpoints
* @cpfile: inode of checkpoint file
* @start: start checkpoint number
- * @end: end checkpoint numer
+ * @end: end checkpoint number
*
* Description: nilfs_cpfile_delete_checkpoints() deletes the checkpoints in
* the period from @start to @end, excluding @end itself. The checkpoints
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index b053b40315bf..d1db73030085 100644
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -1058,7 +1058,7 @@ static int nilfs_ioctl_resize(struct inode *inode, struct file *filp,
* @inode: inode object
* @argp: pointer on argument from userspace
*
- * Decription: nilfs_ioctl_trim_fs is the FITRIM ioctl handle function. It
+ * Description: nilfs_ioctl_trim_fs is the FITRIM ioctl handle function. It
* checks the arguments from userspace and calls nilfs_sufile_trim_fs, which
* performs the actual trim operation.
*
@@ -1100,7 +1100,7 @@ static int nilfs_ioctl_trim_fs(struct inode *inode, void __user *argp)
* @inode: inode object
* @argp: pointer on argument from userspace
*
- * Decription: nilfs_ioctl_set_alloc_range() function defines lower limit
+ * Description: nilfs_ioctl_set_alloc_range() function defines lower limit
* of segments in bytes and upper limit of segments in bytes.
* The NILFS_IOCTL_SET_ALLOC_RANGE is used by nilfs_resize utility.
*
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 221a1cc597f0..8b7b01a380ce 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -195,7 +195,7 @@ static int nilfs_store_log_cursor(struct the_nilfs *nilfs,
/**
* load_nilfs - load and recover the nilfs
* @nilfs: the_nilfs structure to be released
- * @sb: super block isntance used to recover past segment
+ * @sb: super block instance used to recover past segment
*
* load_nilfs() searches and load the latest super root,
* attaches the last segment, and does recovery if needed.
--
2.17.1

2021-04-09 03:01:01

by Ryusuke Konishi

[permalink] [raw]
Subject: Re: [PATCH v2 -next] nilfs2: Fix typos in comments

Thank you. Will apply this.

Ryusuke Konishi

On Fri, Apr 9, 2021 at 11:25 AM Lu Jialin <[email protected]> wrote:
>
> numer -> number in fs/nilfs2/cpfile.c
> Decription -> Description in fs/nilfs2/ioctl.c
> isntance -> instance in fs/nilfs2/the_nilfs.c
>
> Signed-off-by: Lu Jialin <[email protected]>
> ---
> v2:
> Exclude two typo fixes of "retured -> returned", which has been fixed in
> previous patch.
> fs/nilfs2/cpfile.c | 2 +-
> fs/nilfs2/ioctl.c | 4 ++--
> fs/nilfs2/the_nilfs.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
> index 025fb082575a..ce144776b4ef 100644
> --- a/fs/nilfs2/cpfile.c
> +++ b/fs/nilfs2/cpfile.c
> @@ -293,7 +293,7 @@ void nilfs_cpfile_put_checkpoint(struct inode *cpfile, __u64 cno,
> * nilfs_cpfile_delete_checkpoints - delete checkpoints
> * @cpfile: inode of checkpoint file
> * @start: start checkpoint number
> - * @end: end checkpoint numer
> + * @end: end checkpoint number
> *
> * Description: nilfs_cpfile_delete_checkpoints() deletes the checkpoints in
> * the period from @start to @end, excluding @end itself. The checkpoints
> diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
> index b053b40315bf..d1db73030085 100644
> --- a/fs/nilfs2/ioctl.c
> +++ b/fs/nilfs2/ioctl.c
> @@ -1058,7 +1058,7 @@ static int nilfs_ioctl_resize(struct inode *inode, struct file *filp,
> * @inode: inode object
> * @argp: pointer on argument from userspace
> *
> - * Decription: nilfs_ioctl_trim_fs is the FITRIM ioctl handle function. It
> + * Description: nilfs_ioctl_trim_fs is the FITRIM ioctl handle function. It
> * checks the arguments from userspace and calls nilfs_sufile_trim_fs, which
> * performs the actual trim operation.
> *
> @@ -1100,7 +1100,7 @@ static int nilfs_ioctl_trim_fs(struct inode *inode, void __user *argp)
> * @inode: inode object
> * @argp: pointer on argument from userspace
> *
> - * Decription: nilfs_ioctl_set_alloc_range() function defines lower limit
> + * Description: nilfs_ioctl_set_alloc_range() function defines lower limit
> * of segments in bytes and upper limit of segments in bytes.
> * The NILFS_IOCTL_SET_ALLOC_RANGE is used by nilfs_resize utility.
> *
> diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
> index 221a1cc597f0..8b7b01a380ce 100644
> --- a/fs/nilfs2/the_nilfs.c
> +++ b/fs/nilfs2/the_nilfs.c
> @@ -195,7 +195,7 @@ static int nilfs_store_log_cursor(struct the_nilfs *nilfs,
> /**
> * load_nilfs - load and recover the nilfs
> * @nilfs: the_nilfs structure to be released
> - * @sb: super block isntance used to recover past segment
> + * @sb: super block instance used to recover past segment
> *
> * load_nilfs() searches and load the latest super root,
> * attaches the last segment, and does recovery if needed.
> --
> 2.17.1
>