Skip to contentSkip to conversation

fs/ntfs3: Remove unused variable cnt in ntfs_security_init()

PATCH In review Nathan Chancellor 4 participants 4 messages Aug 16, 2021 – Aug 27, 2021 NTFS3 filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs/ntfs3: Remove unused variable cnt in ntfs_security_init()

Clang warns:

fs/ntfs3/fsntfs.c:1874:9: warning: variable 'cnt' set but not used [-Wunused-but-set-variable]

        size_t cnt, off;
               ^

1 warning generated.

It is indeed unused so remove it.

Fixes 82cae269cfa9 ("fs/ntfs3: Add initialization of super block")
---
 fs/ntfs3/fsntfs.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/ntfs3/fsntfs.c +1 -4
index 92140050fb6c..c6599c514acf 100644
@@ -1871,7 +1871,7 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
 	struct ATTRIB *attr;
 	struct ATTR_LIST_ENTRY *le;
 	u64 sds_size;
-	size_t cnt, off;
+	size_t off;
 	struct NTFS_DE *ne;
 	struct NTFS_DE_SII *sii_e;
 	struct ntfs_fnd *fnd_sii = NULL;
@@ -1946,7 +1946,6 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
 	sbi->security.next_off =
 		Quad2Align(sds_size - SecurityDescriptorsBlockSize);
 
-	cnt = 0;
 	off = 0;
 	ne = NULL;
 
@@ -1964,8 +1963,6 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
 		next_id = le32_to_cpu(sii_e->sec_id) + 1;
 		if (next_id >= sbi->security.next_id)
 			sbi->security.next_id = next_id;
-
-		cnt += 1;
 	}
 
 	sbi->security.ni = ni;

base-commit: 96b18047a7172037ff4206720f4e889670030b41

Signature · 1 line
2.33.0.rc2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Nathan Chancellor

Clang warns:

fs/ntfs3/fsntfs.c:1874:9: warning: variable 'cnt' set but not used [-Wunused-but-set-variable]

Quoted 7 lines
        size_t cnt, off;
               ^

1 warning generated.

It is indeed unused so remove it.

Fixes 82cae269cfa9 ("fs/ntfs3: Add initialization of super block")

I went back to the original patches to see if this was ever used;
since v2 (when the ntfs3 driver was split up) it was not. I triple checked the v1 as well.
v2: https://lore.kernel.org/lkml/[email protected]/
v1: https://dl.paragon-software.com/ntfs3/ntfs3.patch
I don't think there's a logic error here.

Quoted 44 lines
---
 fs/ntfs3/fsntfs.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/ntfs3/fsntfs.c +1 -4
index 92140050fb6c..c6599c514acf 100644
@@ -1871,7 +1871,7 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
        struct ATTRIB *attr;
        struct ATTR_LIST_ENTRY *le;
        u64 sds_size;
-       size_t cnt, off;
+       size_t off;
        struct NTFS_DE *ne;
        struct NTFS_DE_SII *sii_e;
        struct ntfs_fnd *fnd_sii = NULL;
@@ -1946,7 +1946,6 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
        sbi->security.next_off =
                Quad2Align(sds_size - SecurityDescriptorsBlockSize);
 
-       cnt = 0;
        off = 0;
        ne = NULL;
 
@@ -1964,8 +1963,6 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
                next_id = le32_to_cpu(sii_e->sec_id) + 1;
                if (next_id >= sbi->security.next_id)
                        sbi->security.next_id = next_id;
-
-               cnt += 1;
        }
 
        sbi->security.ni = ni;

base-commit: 96b18047a7172037ff4206720f4e889670030b41 --
2.33.0.rc2

--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20210816193041.1164125-1-nathan%40kernel.org.

Signature · 2 lines
Thanks,
~Nick Desaulniers
Reviewed-by on v1 1/1
#2 lore raw
In reply to Nathan Chancellor
Quoted 4 lines · Nathan Chancellor

Clang warns:

fs/ntfs3/fsntfs.c:1874:9: warning: variable 'cnt' set but not used [-Wunused-but-set-variable]

Quoted 8 lines
        size_t cnt, off;
               ^

1 warning generated.

It is indeed unused so remove it.

Fixes 82cae269cfa9 ("fs/ntfs3: Add initialization of super block")

Looks like it was used for debugging or way before index_find_raw() needed hint or something. So this should be ok.

Quoted 40 lines
---
 fs/ntfs3/fsntfs.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/ntfs3/fsntfs.c +1 -4
index 92140050fb6c..c6599c514acf 100644
@@ -1871,7 +1871,7 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
 	struct ATTRIB *attr;
 	struct ATTR_LIST_ENTRY *le;
 	u64 sds_size;
-	size_t cnt, off;
+	size_t off;
 	struct NTFS_DE *ne;
 	struct NTFS_DE_SII *sii_e;
 	struct ntfs_fnd *fnd_sii = NULL;
@@ -1946,7 +1946,6 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
 	sbi->security.next_off =
 		Quad2Align(sds_size - SecurityDescriptorsBlockSize);
 
-	cnt = 0;
 	off = 0;
 	ne = NULL;
 
@@ -1964,8 +1963,6 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
 		next_id = le32_to_cpu(sii_e->sec_id) + 1;
 		if (next_id >= sbi->security.next_id)
 			sbi->security.next_id = next_id;
-
-		cnt += 1;
 	}
 
 	sbi->security.ni = ni;

base-commit: 96b18047a7172037ff4206720f4e889670030b41

Signature · 1 line
2.33.0.rc2
#3 lore raw
In reply to Nathan Chancellor
Quoted 54 lines

From: Nathan Chancellor <[email protected]>
Sent: Monday, August 16, 2021 10:31 PM
To: Konstantin Komarov <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Nathan Chancellor <[email protected]>
Subject: [PATCH] fs/ntfs3: Remove unused variable cnt in ntfs_security_init()

Clang warns:

fs/ntfs3/fsntfs.c:1874:9: warning: variable 'cnt' set but not used [-Wunused-but-set-variable]

        size_t cnt, off;
               ^

1 warning generated.

It is indeed unused so remove it.

Fixes 82cae269cfa9 ("fs/ntfs3: Add initialization of super block")
---
 fs/ntfs3/fsntfs.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/ntfs3/fsntfs.c +1 -4
index 92140050fb6c..c6599c514acf 100644
@@ -1871,7 +1871,7 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
 	struct ATTRIB *attr;
 	struct ATTR_LIST_ENTRY *le;
 	u64 sds_size;
-	size_t cnt, off;
+	size_t off;
 	struct NTFS_DE *ne;
 	struct NTFS_DE_SII *sii_e;
 	struct ntfs_fnd *fnd_sii = NULL;
@@ -1946,7 +1946,6 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
 	sbi->security.next_off =
 		Quad2Align(sds_size - SecurityDescriptorsBlockSize);
 
-	cnt = 0;
 	off = 0;
 	ne = NULL;
 
@@ -1964,8 +1963,6 @@ int ntfs_security_init(struct ntfs_sb_info *sbi)
 		next_id = le32_to_cpu(sii_e->sec_id) + 1;
 		if (next_id >= sbi->security.next_id)
 			sbi->security.next_id = next_id;
-
-		cnt += 1;
 	}
 
 	sbi->security.ni = ni;
Quoted 3 lines

base-commit: 96b18047a7172037ff4206720f4e889670030b41 --
2.33.0.rc2

Hi Nathan! Thanks for your contribution - applied.

Best regards.