2014-04-09 17:31:51

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 1/1] NFSD: Remove NULL value assignments

Static values are automatically initialized to NULL.

Cc: Andrew Morton <[email protected]>
Cc: [email protected]
Signed-off-by: Fabian Frederick <[email protected]>
---
fs/nfsd/nfs4state.c | 10 +++++-----
fs/nfsd/nfssvc.c | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3ba6597..c80097e 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -83,11 +83,11 @@ static DEFINE_MUTEX(client_mutex);
*/
static DEFINE_SPINLOCK(recall_lock);

-static struct kmem_cache *openowner_slab = NULL;
-static struct kmem_cache *lockowner_slab = NULL;
-static struct kmem_cache *file_slab = NULL;
-static struct kmem_cache *stateid_slab = NULL;
-static struct kmem_cache *deleg_slab = NULL;
+static struct kmem_cache *openowner_slab;
+static struct kmem_cache *lockowner_slab;
+static struct kmem_cache *file_slab;
+static struct kmem_cache *stateid_slab;
+static struct kmem_cache *deleg_slab;

void
nfs4_lock_state(void)
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 9a4a5f9..04407a4 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -205,7 +205,7 @@ static int nfsd_init_socks(struct net *net)
return 0;
}

-static int nfsd_users = 0;
+static int nfsd_users;

static int nfsd_startup_generic(int nrservs)
{