2014-04-09 17:01:36

by Fabian Frédérick

Subject: [PATCH v2] NTFS: Remove NULL value assignments

Static values are automatically initialized to NULL.

Acked-by: Anton Altaparmakov <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Anton Altaparmakov <[email protected]>
Signed-off-by: Fabian Frederick <[email protected]>
---
fs/ntfs/compress.c | 2 +-
fs/ntfs/super.c | 4 ++--
fs/ntfs/sysctl.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c
index ee4144c..f82498c 100644
--- a/fs/ntfs/compress.c
+++ b/fs/ntfs/compress.c
@@ -58,7 +58,7 @@ typedef enum {
/**
* ntfs_compression_buffer - one buffer for the decompression engine
*/
-static u8 *ntfs_compression_buffer = NULL;
+static u8 *ntfs_compression_buffer;

/**
* ntfs_cb_lock - spinlock which protects ntfs_compression_buffer
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 9de2491..6c3296e 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -50,8 +50,8 @@
static unsigned long ntfs_nr_compression_users;

/* A global default upcase table and a corresponding reference count. */
-static ntfschar *default_upcase = NULL;
-static unsigned long ntfs_nr_upcase_users = 0;
+static ntfschar *default_upcase;
+static unsigned long ntfs_nr_upcase_users;

/* Error constants/strings used in inode.c::ntfs_show_options(). */
typedef enum {
diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c
index 79a8918..1927170 100644
--- a/fs/ntfs/sysctl.c
+++ b/fs/ntfs/sysctl.c
@@ -56,7 +56,7 @@ static ctl_table sysctls_root[] = {
};

/* Storage for the sysctls header. */
-static struct ctl_table_header *sysctls_root_table = NULL;
+static struct ctl_table_header *sysctls_root_table;

/**
* ntfs_sysctl - add or remove the debug sysctl

2014-04-09 19:53:44

by Anton Altaparmakov

Subject: Re: [PATCH v2] NTFS: Remove NULL value assignments

Hi Andrew,

Please could you merge this via your patch series? Thanks a lot in advance!

Best regards,

Anton

On 9 Apr 2014, at 18:01, Fabian Frederick <[email protected]> wrote:

> Static values are automatically initialized to NULL.
>
> Acked-by: Anton Altaparmakov <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: Anton Altaparmakov <[email protected]>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> fs/ntfs/compress.c | 2 +-
> fs/ntfs/super.c | 4 ++--
> fs/ntfs/sysctl.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c
> index ee4144c..f82498c 100644
> --- a/fs/ntfs/compress.c
> +++ b/fs/ntfs/compress.c
> @@ -58,7 +58,7 @@ typedef enum {
> /**
> * ntfs_compression_buffer - one buffer for the decompression engine
> */
> -static u8 *ntfs_compression_buffer = NULL;
> +static u8 *ntfs_compression_buffer;
>
> /**
> * ntfs_cb_lock - spinlock which protects ntfs_compression_buffer
> diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
> index 9de2491..6c3296e 100644
> --- a/fs/ntfs/super.c
> +++ b/fs/ntfs/super.c
> @@ -50,8 +50,8 @@
> static unsigned long ntfs_nr_compression_users;
>
> /* A global default upcase table and a corresponding reference count. */
> -static ntfschar *default_upcase = NULL;
> -static unsigned long ntfs_nr_upcase_users = 0;
> +static ntfschar *default_upcase;
> +static unsigned long ntfs_nr_upcase_users;
>
> /* Error constants/strings used in inode.c::ntfs_show_options(). */
> typedef enum {
> diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c
> index 79a8918..1927170 100644
> --- a/fs/ntfs/sysctl.c
> +++ b/fs/ntfs/sysctl.c
> @@ -56,7 +56,7 @@ static ctl_table sysctls_root[] = {
> };
>
> /* Storage for the sysctls header. */
> -static struct ctl_table_header *sysctls_root_table = NULL;
> +static struct ctl_table_header *sysctls_root_table;
>
> /**
> * ntfs_sysctl - add or remove the debug sysctl

--
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge
J.J. Thomson Avenue, Cambridge, CB3 0RB, UK