4 files changed, 5 insertions, 6 deletions

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 52774feab93f..f95cc3f3c42d 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -160,7 +160,7 @@ static void nlmclnt_prepare_reclaim(struct nlm_host *host)
          */
         list_splice_init(&host->h_granted, &host->h_reclaim);
 
-        dprintk("NLM: reclaiming locks for host %s", host->h_name);
+        dprintk("NLM: reclaiming locks for host %s\n", host->h_name);
 }
 
 static void nlmclnt_finish_reclaim(struct nlm_host *host)
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index 50dbb67ae0c4..271e2165fff6 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -100,7 +100,7 @@ static struct nlm_lockowner *nlm_find_lockowner(struct nlm_host *host, fl_owner_
         res = __nlm_find_lockowner(host, owner);
         if (res == NULL) {
                 spin_unlock(&host->h_lock);
-                new = (struct nlm_lockowner *)kmalloc(sizeof(*new), GFP_KERNEL);
+                new = kmalloc(sizeof(*new), GFP_KERNEL);
                 spin_lock(&host->h_lock);
                 res = __nlm_find_lockowner(host, owner);
                 if (res == NULL && new != NULL) {
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 703fb038c813..a0d0b58ce7a4 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -99,9 +99,9 @@ nlm_lookup_host(int server, struct sockaddr_in *sin,
         /* Ooops, no host found, create it */
         dprintk("lockd: creating host entry\n");
 
-        if (!(host = (struct nlm_host *) kmalloc(sizeof(*host), GFP_KERNEL)))
+        host = kzalloc(sizeof(*host), GFP_KERNEL);
+        if (!host)
                 goto nohost;
-        memset(host, 0, sizeof(*host));
 
         addr = sin->sin_addr.s_addr;
         sprintf(host->h_name, "%u.%u.%u.%u", NIPQUAD(addr));
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 01b4db9e5466..a92dd98f8401 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -100,11 +100,10 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,
         nlm_debug_print_fh("creating file for", f);
 
         nfserr = nlm_lck_denied_nolocks;
-        file = (struct nlm_file *) kmalloc(sizeof(*file), GFP_KERNEL);
+        file = kzalloc(sizeof(*file), GFP_KERNEL);
         if (!file)
                 goto out_unlock;
 
-        memset(file, 0, sizeof(*file));
         memcpy(&file->f_handle, f, sizeof(struct nfs_fh));
         file->f_hash = hash;
         init_MUTEX(&file->f_sema);