summary refs log tree commit diff
path: root/fs/cifs/readdir.c
diff options
context:
space:
mode:
authorvignesh <vignesh.babu@wipro.com>2007-04-25 12:13:48 +0000
committerSteve French <sfrench@us.ibm.com>2007-04-25 12:13:48 +0000
commiteaa33a9ac04cf5760cf4e661241db19f4151cf06 (patch)
tree8e761d546e1c5db30943adb38d196d44e9f33b33 /fs/cifs/readdir.c
parent5858ae44e289ac6c809af3fe81b9a6ed41914d41 (diff)
downloadlinux-eaa33a9ac04cf5760cf4e661241db19f4151cf06.tar.gz
[CIFS] Replace kmalloc/memset combination with kzalloc
Signed-off-by: Vignesh Babu <vignesh.babu@wipro.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/readdir.c')
-rw-r--r--fs/cifs/readdir.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index 3fab8ed697d1..b80b0fc1c4c4 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -432,14 +432,11 @@ static int initiate_cifs_search(const int xid, struct file *file)
 
 	if(file->private_data == NULL) {
 		file->private_data = 
-			kmalloc(sizeof(struct cifsFileInfo),GFP_KERNEL);
+			kzalloc(sizeof(struct cifsFileInfo),GFP_KERNEL);
 	}
 
-	if(file->private_data == NULL) {
+	if(file->private_data == NULL)
 		return -ENOMEM;
-	} else {
-		memset(file->private_data,0,sizeof(struct cifsFileInfo));
-	}
 	cifsFile = file->private_data;
 	cifsFile->invalidHandle = TRUE;
 	cifsFile->srch_inf.endOfSearch = FALSE;