diff --git a/[refs] b/[refs] index 1e7d7f9cf656..c0226c2ca27f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5858ae44e289ac6c809af3fe81b9a6ed41914d41 +refs/heads/master: eaa33a9ac04cf5760cf4e661241db19f4151cf06 diff --git a/trunk/fs/cifs/readdir.c b/trunk/fs/cifs/readdir.c index 3fab8ed697d1..b80b0fc1c4c4 100644 --- a/trunk/fs/cifs/readdir.c +++ b/trunk/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;