2021-08-16 12:05:00

by Kari Argillander

Subject: [PATCH] fs/ntfs3: Add ifndef + define to all header files

Add guards so that compiler will only include header files once.

Signed-off-by: Kari Argillander <[email protected]>
---
I do not mind if this get's merged to V28/V29 without commit.
---
fs/ntfs3/debug.h | 5 +++++
fs/ntfs3/ntfs.h | 3 +++
fs/ntfs3/ntfs_fs.h | 5 +++++
3 files changed, 13 insertions(+)

diff --git a/fs/ntfs3/debug.h b/fs/ntfs3/debug.h
index dfaa4c79dc6d..465466631d38 100644
--- a/fs/ntfs3/debug.h
+++ b/fs/ntfs3/debug.h
@@ -7,6 +7,9 @@
*/

// clang-format off
+#ifndef _LINUX_NTFS3_DEBUG_H
+#define _LINUX_NTFS3_DEBUG_H
+
#ifndef Add2Ptr
#define Add2Ptr(P, I) ((void *)((u8 *)(P) + (I)))
#define PtrOffset(B, O) ((size_t)((size_t)(O) - (size_t)(B)))
@@ -61,4 +64,6 @@ void ntfs_inode_printk(struct inode *inode, const char *fmt, ...)
#define ntfs_free(p) kfree(p)
#define ntfs_vfree(p) kvfree(p)
#define ntfs_memdup(src, len) kmemdup(src, len, GFP_NOFS)
+
+#endif /* _LINUX_NTFS3_DEBUG_H */
// clang-format on
diff --git a/fs/ntfs3/ntfs.h b/fs/ntfs3/ntfs.h
index 40398e6c39c9..16da514af124 100644
--- a/fs/ntfs3/ntfs.h
+++ b/fs/ntfs3/ntfs.h
@@ -7,6 +7,8 @@
*/

// clang-format off
+#ifndef _LINUX_NTFS3_NTFS_H
+#define _LINUX_NTFS3_NTFS_H

/* TODO:
* - Check 4K mft record and 512 bytes cluster
@@ -1235,4 +1237,5 @@ struct SID {
};
static_assert(offsetof(struct SID, SubAuthority) == 8);

+#endif /* _LINUX_NTFS3_NTFS_H */
// clang-format on
diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h
index 0c3ac89c3115..80e1dea2579a 100644
--- a/fs/ntfs3/ntfs_fs.h
+++ b/fs/ntfs3/ntfs_fs.h
@@ -6,6 +6,9 @@
*/

// clang-format off
+#ifndef _LINUX_NTFS3_NTFS_FS_H
+#define _LINUX_NTFS3_NTFS_FS_H
+
#define MINUS_ONE_T ((size_t)(-1))
/* Biggest MFT / smallest cluster */
#define MAXIMUM_BYTES_PER_MFT 4096
@@ -1090,3 +1093,5 @@ static inline void le64_sub_cpu(__le64 *var, u64 val)
{
*var = cpu_to_le64(le64_to_cpu(*var) - val);
}
+
+#endif /* _LINUX_NTFS3_NTFS_FS_H */
--
2.30.2

2021-08-27 16:14:43

by Konstantin Komarov

Subject: RE: [PATCH] fs/ntfs3: Add ifndef + define to all header files

> From: Kari Argillander <[email protected]>
> Sent: Monday, August 16, 2021 3:02 PM
> To: Konstantin Komarov <[email protected]>; [email protected]
> Cc: Kari Argillander <[email protected]>; [email protected]
> Subject: [PATCH] fs/ntfs3: Add ifndef + define to all header files
>
> Add guards so that compiler will only include header files once.
>
> Signed-off-by: Kari Argillander <[email protected]>
> ---
> I do not mind if this get's merged to V28/V29 without commit.
> ---
> fs/ntfs3/debug.h | 5 +++++
> fs/ntfs3/ntfs.h | 3 +++
> fs/ntfs3/ntfs_fs.h | 5 +++++
> 3 files changed, 13 insertions(+)
>
> diff --git a/fs/ntfs3/debug.h b/fs/ntfs3/debug.h
> index dfaa4c79dc6d..465466631d38 100644
> --- a/fs/ntfs3/debug.h
> +++ b/fs/ntfs3/debug.h
> @@ -7,6 +7,9 @@
> */
>
> // clang-format off
> +#ifndef _LINUX_NTFS3_DEBUG_H
> +#define _LINUX_NTFS3_DEBUG_H
> +
> #ifndef Add2Ptr
> #define Add2Ptr(P, I) ((void *)((u8 *)(P) + (I)))
> #define PtrOffset(B, O) ((size_t)((size_t)(O) - (size_t)(B)))
> @@ -61,4 +64,6 @@ void ntfs_inode_printk(struct inode *inode, const char *fmt, ...)
> #define ntfs_free(p) kfree(p)
> #define ntfs_vfree(p) kvfree(p)
> #define ntfs_memdup(src, len) kmemdup(src, len, GFP_NOFS)
> +
> +#endif /* _LINUX_NTFS3_DEBUG_H */
> // clang-format on
> diff --git a/fs/ntfs3/ntfs.h b/fs/ntfs3/ntfs.h
> index 40398e6c39c9..16da514af124 100644
> --- a/fs/ntfs3/ntfs.h
> +++ b/fs/ntfs3/ntfs.h
> @@ -7,6 +7,8 @@
> */
>
> // clang-format off
> +#ifndef _LINUX_NTFS3_NTFS_H
> +#define _LINUX_NTFS3_NTFS_H
>
> /* TODO:
> * - Check 4K mft record and 512 bytes cluster
> @@ -1235,4 +1237,5 @@ struct SID {
> };
> static_assert(offsetof(struct SID, SubAuthority) == 8);
>
> +#endif /* _LINUX_NTFS3_NTFS_H */
> // clang-format on
> diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h
> index 0c3ac89c3115..80e1dea2579a 100644
> --- a/fs/ntfs3/ntfs_fs.h
> +++ b/fs/ntfs3/ntfs_fs.h
> @@ -6,6 +6,9 @@
> */
>
> // clang-format off
> +#ifndef _LINUX_NTFS3_NTFS_FS_H
> +#define _LINUX_NTFS3_NTFS_FS_H
> +
> #define MINUS_ONE_T ((size_t)(-1))
> /* Biggest MFT / smallest cluster */
> #define MAXIMUM_BYTES_PER_MFT 4096
> @@ -1090,3 +1093,5 @@ static inline void le64_sub_cpu(__le64 *var, u64 val)
> {
> *var = cpu_to_le64(le64_to_cpu(*var) - val);
> }
> +
> +#endif /* _LINUX_NTFS3_NTFS_FS_H */
> --
> 2.30.2

Thanks again - applied!

Best regards