2020-09-18 01:22:20

by Randy Dunlap

Subject: [PATCH RESEND] ntfs: drop unneeded semi-colons

Coccinelle scripts report:

fs/ntfs/lcnalloc.c:902:2-3: Unneeded semicolon
fs/ntfs/super.c:1615:2-3: Unneeded semicolon
fs/ntfs/super.c:1684:2-3: Unneeded semicolon

so remove the extraneous semicolons.

Signed-off-by: Randy Dunlap <[email protected]>
Cc: Anton Altaparmakov <[email protected]>
Cc: [email protected]
Cc: Andrew Morton <[email protected]>
---
Adding Andrew to recipients, otherwise this patch is lost/ignored.

fs/ntfs/lcnalloc.c | 2 +-
fs/ntfs/super.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

--- linux-next-20200917.orig/fs/ntfs/lcnalloc.c
+++ linux-next-20200917/fs/ntfs/lcnalloc.c
@@ -899,7 +899,7 @@ s64 __ntfs_cluster_free(ntfs_inode *ni,
}
/* We have freed @to_free real clusters. */
real_freed = to_free;
- };
+ }
/* Go to the next run and adjust the number of clusters left to free. */
++rl;
if (count >= 0)
--- linux-next-20200917.orig/fs/ntfs/super.c
+++ linux-next-20200917/fs/ntfs/super.c
@@ -1612,7 +1612,7 @@ read_partial_attrdef_page:
memcpy((u8*)vol->attrdef + (index++ << PAGE_SHIFT),
page_address(page), size);
ntfs_unmap_page(page);
- };
+ }
if (size == PAGE_SIZE) {
size = i_size & ~PAGE_MASK;
if (size)
@@ -1681,7 +1681,7 @@ read_partial_upcase_page:
memcpy((char*)vol->upcase + (index++ << PAGE_SHIFT),
page_address(page), size);
ntfs_unmap_page(page);
- };
+ }
if (size == PAGE_SIZE) {
size = i_size & ~PAGE_MASK;
if (size)

2020-09-18 14:35:39

by Anton Altaparmakov

Subject: Re: [PATCH RESEND] ntfs: drop unneeded semi-colons

Hi Randy,

Sorry, I don't know how I missed those originally.

Andrew, please could you add this to your tree for merging with Linus as well?

And again, please feel free to add: Acked-by: Anton Altaparmakov <[email protected]>

Thanks a lot!

Best regards,

Anton

> On 18 Sep 2020, at 02:20, Randy Dunlap <[email protected]> wrote:
>
> Coccinelle scripts report:
>
> fs/ntfs/lcnalloc.c:902:2-3: Unneeded semicolon
> fs/ntfs/super.c:1615:2-3: Unneeded semicolon
> fs/ntfs/super.c:1684:2-3: Unneeded semicolon
>
> so remove the extraneous semicolons.
>
> Signed-off-by: Randy Dunlap <[email protected]>
> Cc: Anton Altaparmakov <[email protected]>
> Cc: [email protected]
> Cc: Andrew Morton <[email protected]>
> ---
> Adding Andrew to recipients, otherwise this patch is lost/ignored.
>
> fs/ntfs/lcnalloc.c | 2 +-
> fs/ntfs/super.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> --- linux-next-20200917.orig/fs/ntfs/lcnalloc.c
> +++ linux-next-20200917/fs/ntfs/lcnalloc.c
> @@ -899,7 +899,7 @@ s64 __ntfs_cluster_free(ntfs_inode *ni,
> }
> /* We have freed @to_free real clusters. */
> real_freed = to_free;
> - };
> + }
> /* Go to the next run and adjust the number of clusters left to free. */
> ++rl;
> if (count >= 0)
> --- linux-next-20200917.orig/fs/ntfs/super.c
> +++ linux-next-20200917/fs/ntfs/super.c
> @@ -1612,7 +1612,7 @@ read_partial_attrdef_page:
> memcpy((u8*)vol->attrdef + (index++ << PAGE_SHIFT),
> page_address(page), size);
> ntfs_unmap_page(page);
> - };
> + }
> if (size == PAGE_SIZE) {
> size = i_size & ~PAGE_MASK;
> if (size)
> @@ -1681,7 +1681,7 @@ read_partial_upcase_page:
> memcpy((char*)vol->upcase + (index++ << PAGE_SHIFT),
> page_address(page), size);
> ntfs_unmap_page(page);
> - };
> + }
> if (size == PAGE_SIZE) {
> size = i_size & ~PAGE_MASK;
> if (size)


--
Anton Altaparmakov <anton at tuxera.com> (replace at with @)
Lead in File System Development, Tuxera Inc., http://www.tuxera.com/
Linux NTFS maintainer