[CIFS] Convert remaining places in fs/cifs from
kmalloc/memset to simpler kzalloc usage Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
parent
e601ef22bc
commit
a048d7a870
|
@ -93,13 +93,10 @@ cifs_read_super(struct super_block *sb, void *data,
|
|||
int rc = 0;
|
||||
|
||||
sb->s_flags |= MS_NODIRATIME; /* and probably even noatime */
|
||||
sb->s_fs_info = kmalloc(sizeof(struct cifs_sb_info),GFP_KERNEL);
|
||||
sb->s_fs_info = kzalloc(sizeof(struct cifs_sb_info),GFP_KERNEL);
|
||||
cifs_sb = CIFS_SB(sb);
|
||||
if(cifs_sb == NULL)
|
||||
return -ENOMEM;
|
||||
else
|
||||
memset(cifs_sb,0,sizeof(struct cifs_sb_info));
|
||||
|
||||
|
||||
rc = cifs_mount(sb, cifs_sb, data, devname);
|
||||
|
||||
|
|
|
@ -255,12 +255,10 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
|
|||
CIFSSMBClose(xid, pTcon, fileHandle);
|
||||
} else if(newinode) {
|
||||
pCifsFile =
|
||||
kmalloc(sizeof (struct cifsFileInfo), GFP_KERNEL);
|
||||
kzalloc(sizeof (struct cifsFileInfo), GFP_KERNEL);
|
||||
|
||||
if(pCifsFile == NULL)
|
||||
goto cifs_create_out;
|
||||
memset((char *)pCifsFile, 0,
|
||||
sizeof (struct cifsFileInfo));
|
||||
pCifsFile->netfid = fileHandle;
|
||||
pCifsFile->pid = current->tgid;
|
||||
pCifsFile->pInode = newinode;
|
||||
|
|
|
@ -609,9 +609,8 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
|
|||
}
|
||||
} else if (rc == -EACCES) {
|
||||
/* try only if r/o attribute set in local lookup data? */
|
||||
pinfo_buf = kmalloc(sizeof(FILE_BASIC_INFO), GFP_KERNEL);
|
||||
pinfo_buf = kzalloc(sizeof(FILE_BASIC_INFO), GFP_KERNEL);
|
||||
if (pinfo_buf) {
|
||||
memset(pinfo_buf, 0, sizeof(FILE_BASIC_INFO));
|
||||
/* ATTRS set to normal clears r/o bit */
|
||||
pinfo_buf->Attributes = cpu_to_le32(ATTR_NORMAL);
|
||||
if (!(pTcon->ses->flags & CIFS_SES_NT4))
|
||||
|
|
|
@ -72,10 +72,9 @@ sesInfoAlloc(void)
|
|||
struct cifsSesInfo *ret_buf;
|
||||
|
||||
ret_buf =
|
||||
(struct cifsSesInfo *) kmalloc(sizeof (struct cifsSesInfo),
|
||||
(struct cifsSesInfo *) kzalloc(sizeof (struct cifsSesInfo),
|
||||
GFP_KERNEL);
|
||||
if (ret_buf) {
|
||||
memset(ret_buf, 0, sizeof (struct cifsSesInfo));
|
||||
write_lock(&GlobalSMBSeslock);
|
||||
atomic_inc(&sesInfoAllocCount);
|
||||
ret_buf->status = CifsNew;
|
||||
|
@ -110,10 +109,9 @@ tconInfoAlloc(void)
|
|||
{
|
||||
struct cifsTconInfo *ret_buf;
|
||||
ret_buf =
|
||||
(struct cifsTconInfo *) kmalloc(sizeof (struct cifsTconInfo),
|
||||
(struct cifsTconInfo *) kzalloc(sizeof (struct cifsTconInfo),
|
||||
GFP_KERNEL);
|
||||
if (ret_buf) {
|
||||
memset(ret_buf, 0, sizeof (struct cifsTconInfo));
|
||||
write_lock(&GlobalSMBSeslock);
|
||||
atomic_inc(&tconInfoAllocCount);
|
||||
list_add(&ret_buf->cifsConnectionList,
|
||||
|
|
Loading…
Reference in a new issue