diff mbox

[1/1] OCFS2: Remove NULL assignments on static

Message ID 20140408221342.9759bea1dd852f2787f82586@skynet.be (mailing list archive)
State New, archived
Headers show

Commit Message

Fabian Frederick April 8, 2014, 8:13 p.m. UTC
static values are automatically initialized to NULL.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: ocfs2-devel@oss.oracle.com
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 fs/ocfs2/cluster/tcp.c   | 2 +-
 fs/ocfs2/dlm/dlmdebug.c  | 2 +-
 fs/ocfs2/dlm/dlmlock.c   | 2 +-
 fs/ocfs2/dlm/dlmmaster.c | 6 +++---
 fs/ocfs2/stackglue.c     | 2 +-
 fs/ocfs2/super.c         | 4 ++--
 fs/ocfs2/uptodate.c      | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

Comments

Wengang Wang April 9, 2014, 12:53 a.m. UTC | #1
Hi Fabian,

What's the badness if we do the assignments?

thanks,
wengang

? 2014?04?09? 04:13, Fabian Frederick ??:
> static values are automatically initialized to NULL.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: ocfs2-devel@oss.oracle.com
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
> ---
>   fs/ocfs2/cluster/tcp.c   | 2 +-
>   fs/ocfs2/dlm/dlmdebug.c  | 2 +-
>   fs/ocfs2/dlm/dlmlock.c   | 2 +-
>   fs/ocfs2/dlm/dlmmaster.c | 6 +++---
>   fs/ocfs2/stackglue.c     | 2 +-
>   fs/ocfs2/super.c         | 4 ++--
>   fs/ocfs2/uptodate.c      | 2 +-
>   7 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
> index eb649d2..161fb1e 100644
> --- a/fs/ocfs2/cluster/tcp.c
> +++ b/fs/ocfs2/cluster/tcp.c
> @@ -108,7 +108,7 @@ static struct rb_root o2net_handler_tree = RB_ROOT;
>   static struct o2net_node o2net_nodes[O2NM_MAX_NODES];
>   
>   /* XXX someday we'll need better accounting */
> -static struct socket *o2net_listen_sock = NULL;
> +static struct socket *o2net_listen_sock;
>   
>   /*
>    * listen work is only queued by the listening socket callbacks on the
> diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
> index e33cd7a..18f13c2 100644
> --- a/fs/ocfs2/dlm/dlmdebug.c
> +++ b/fs/ocfs2/dlm/dlmdebug.c
> @@ -338,7 +338,7 @@ void dlm_print_one_mle(struct dlm_master_list_entry *mle)
>   
>   #ifdef CONFIG_DEBUG_FS
>   
> -static struct dentry *dlm_debugfs_root = NULL;
> +static struct dentry *dlm_debugfs_root;
>   
>   #define DLM_DEBUGFS_DIR				"o2dlm"
>   #define DLM_DEBUGFS_DLM_STATE			"dlm_state"
> diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c
> index 5d32f75..66c2a49 100644
> --- a/fs/ocfs2/dlm/dlmlock.c
> +++ b/fs/ocfs2/dlm/dlmlock.c
> @@ -52,7 +52,7 @@
>   #define MLOG_MASK_PREFIX ML_DLM
>   #include "cluster/masklog.h"
>   
> -static struct kmem_cache *dlm_lock_cache = NULL;
> +static struct kmem_cache *dlm_lock_cache;
>   
>   static DEFINE_SPINLOCK(dlm_cookie_lock);
>   static u64 dlm_next_cookie = 1;
> diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
> index af3f7aa..fd07ef9 100644
> --- a/fs/ocfs2/dlm/dlmmaster.c
> +++ b/fs/ocfs2/dlm/dlmmaster.c
> @@ -82,9 +82,9 @@ static inline int dlm_mle_equal(struct dlm_ctxt *dlm,
>   	return 1;
>   }
>   
> -static struct kmem_cache *dlm_lockres_cache = NULL;
> -static struct kmem_cache *dlm_lockname_cache = NULL;
> -static struct kmem_cache *dlm_mle_cache = NULL;
> +static struct kmem_cache *dlm_lockres_cache;
> +static struct kmem_cache *dlm_lockname_cache;
> +static struct kmem_cache *dlm_mle_cache;
>   
>   static void dlm_mle_release(struct kref *kref);
>   static void dlm_init_mle(struct dlm_master_list_entry *mle,
> diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
> index 83f1a66..5d965e8 100644
> --- a/fs/ocfs2/stackglue.c
> +++ b/fs/ocfs2/stackglue.c
> @@ -709,7 +709,7 @@ static struct ctl_table ocfs2_root_table[] = {
>   	{ }
>   };
>   
> -static struct ctl_table_header *ocfs2_table_header = NULL;
> +static struct ctl_table_header *ocfs2_table_header;
>   
>   
>   /*
> diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
> index a7cdd56..9027729 100644
> --- a/fs/ocfs2/super.c
> +++ b/fs/ocfs2/super.c
> @@ -75,7 +75,7 @@
>   
>   #include "buffer_head_io.h"
>   
> -static struct kmem_cache *ocfs2_inode_cachep = NULL;
> +static struct kmem_cache *ocfs2_inode_cachep;
>   struct kmem_cache *ocfs2_dquot_cachep;
>   struct kmem_cache *ocfs2_qf_chunk_cachep;
>   
> @@ -85,7 +85,7 @@ struct kmem_cache *ocfs2_qf_chunk_cachep;
>    * workqueue and schedule on our own. */
>   struct workqueue_struct *ocfs2_wq = NULL;
>   
> -static struct dentry *ocfs2_debugfs_root = NULL;
> +static struct dentry *ocfs2_debugfs_root;
>   
>   MODULE_AUTHOR("Oracle");
>   MODULE_LICENSE("GPL");
> diff --git a/fs/ocfs2/uptodate.c b/fs/ocfs2/uptodate.c
> index 52eaf33..82e17b0 100644
> --- a/fs/ocfs2/uptodate.c
> +++ b/fs/ocfs2/uptodate.c
> @@ -67,7 +67,7 @@ struct ocfs2_meta_cache_item {
>   	sector_t	c_block;
>   };
>   
> -static struct kmem_cache *ocfs2_uptodate_cachep = NULL;
> +static struct kmem_cache *ocfs2_uptodate_cachep;
>   
>   u64 ocfs2_metadata_cache_owner(struct ocfs2_caching_info *ci)
>   {
Fabian Frederick April 9, 2014, 4:22 a.m. UTC | #2
On Wed, 09 Apr 2014 08:53:14 +0800
Wengang <wen.gang.wang@oracle.com> wrote:

> Hi Fabian,
> 
> What's the badness if we do the assignments?
> 
> thanks,
> wengang

Hi Wengang,

	Nothing wrong but AFAICS redundant.

Regards,
Fabian
Andrew Morton April 9, 2014, 8:44 p.m. UTC | #3
On Wed, 09 Apr 2014 08:53:14 +0800 Wengang <wen.gang.wang@oracle.com> wrote:

> ___ 2014___04___09___ 04:13, Fabian Frederick ______:
> > static values are automatically initialized to NULL.
> >
>
> What's the badness if we do the assignments?

(top-posting repaired...)

Back in the olden days,

	static int x = 0;

would consume space in the .data segment and

	static int x;

would consume space in the .bss segment.


The .data segment is a part of vmlinux (because it contains non-zero
data) whereas .bss does not occupy space in vmlinux because .bss is
all-zero and can be built at runtime

So the effect of this patch would be to reduce the size of the kernel
image.  Less disk space, less ROM space, etc.


I think more recent gcc's and linkers got smarter about that and move
initialized-to-zero .data into .bss anyway.
diff mbox

Patch

diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index eb649d2..161fb1e 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -108,7 +108,7 @@  static struct rb_root o2net_handler_tree = RB_ROOT;
 static struct o2net_node o2net_nodes[O2NM_MAX_NODES];
 
 /* XXX someday we'll need better accounting */
-static struct socket *o2net_listen_sock = NULL;
+static struct socket *o2net_listen_sock;
 
 /*
  * listen work is only queued by the listening socket callbacks on the
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index e33cd7a..18f13c2 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -338,7 +338,7 @@  void dlm_print_one_mle(struct dlm_master_list_entry *mle)
 
 #ifdef CONFIG_DEBUG_FS
 
-static struct dentry *dlm_debugfs_root = NULL;
+static struct dentry *dlm_debugfs_root;
 
 #define DLM_DEBUGFS_DIR				"o2dlm"
 #define DLM_DEBUGFS_DLM_STATE			"dlm_state"
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c
index 5d32f75..66c2a49 100644
--- a/fs/ocfs2/dlm/dlmlock.c
+++ b/fs/ocfs2/dlm/dlmlock.c
@@ -52,7 +52,7 @@ 
 #define MLOG_MASK_PREFIX ML_DLM
 #include "cluster/masklog.h"
 
-static struct kmem_cache *dlm_lock_cache = NULL;
+static struct kmem_cache *dlm_lock_cache;
 
 static DEFINE_SPINLOCK(dlm_cookie_lock);
 static u64 dlm_next_cookie = 1;
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index af3f7aa..fd07ef9 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -82,9 +82,9 @@  static inline int dlm_mle_equal(struct dlm_ctxt *dlm,
 	return 1;
 }
 
-static struct kmem_cache *dlm_lockres_cache = NULL;
-static struct kmem_cache *dlm_lockname_cache = NULL;
-static struct kmem_cache *dlm_mle_cache = NULL;
+static struct kmem_cache *dlm_lockres_cache;
+static struct kmem_cache *dlm_lockname_cache;
+static struct kmem_cache *dlm_mle_cache;
 
 static void dlm_mle_release(struct kref *kref);
 static void dlm_init_mle(struct dlm_master_list_entry *mle,
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
index 83f1a66..5d965e8 100644
--- a/fs/ocfs2/stackglue.c
+++ b/fs/ocfs2/stackglue.c
@@ -709,7 +709,7 @@  static struct ctl_table ocfs2_root_table[] = {
 	{ }
 };
 
-static struct ctl_table_header *ocfs2_table_header = NULL;
+static struct ctl_table_header *ocfs2_table_header;
 
 
 /*
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index a7cdd56..9027729 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -75,7 +75,7 @@ 
 
 #include "buffer_head_io.h"
 
-static struct kmem_cache *ocfs2_inode_cachep = NULL;
+static struct kmem_cache *ocfs2_inode_cachep;
 struct kmem_cache *ocfs2_dquot_cachep;
 struct kmem_cache *ocfs2_qf_chunk_cachep;
 
@@ -85,7 +85,7 @@  struct kmem_cache *ocfs2_qf_chunk_cachep;
  * workqueue and schedule on our own. */
 struct workqueue_struct *ocfs2_wq = NULL;
 
-static struct dentry *ocfs2_debugfs_root = NULL;
+static struct dentry *ocfs2_debugfs_root;
 
 MODULE_AUTHOR("Oracle");
 MODULE_LICENSE("GPL");
diff --git a/fs/ocfs2/uptodate.c b/fs/ocfs2/uptodate.c
index 52eaf33..82e17b0 100644
--- a/fs/ocfs2/uptodate.c
+++ b/fs/ocfs2/uptodate.c
@@ -67,7 +67,7 @@  struct ocfs2_meta_cache_item {
 	sector_t	c_block;
 };
 
-static struct kmem_cache *ocfs2_uptodate_cachep = NULL;
+static struct kmem_cache *ocfs2_uptodate_cachep;
 
 u64 ocfs2_metadata_cache_owner(struct ocfs2_caching_info *ci)
 {