dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[CIFS] remove some redundant argument checks 

This patch does kmalloc + memset conversion to kzalloc and removes some
redundant argument checks.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Mariusz Kozlowski 2007-10-03 16:41:24 +00:00 committed by Steve French
parent 9b22b0b726
commit a8a11d399f
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/cifs/connect.c
View File

@ -673,9 +673,8 @@ multi_t2_fnd:
server->ssocket = NULL; server->ssocket = NULL;
} }
/* buffer usuallly freed in free_mid - need to free it here on exit */ /* buffer usuallly freed in free_mid - need to free it here on exit */
if (bigbuf != NULL) cifs_buf_release(bigbuf);
cifs_buf_release(bigbuf); if (smallbuf) /* no sense logging a debug message if NULL */
if (smallbuf != NULL)
cifs_small_buf_release(smallbuf); cifs_small_buf_release(smallbuf);
read_lock(&GlobalSMBSeslock); read_lock(&GlobalSMBSeslock);
@ -1910,8 +1909,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
return rc; return rc;
} }
srvTcp = kmalloc(sizeof (struct TCP_Server_Info), GFP_KERNEL); srvTcp = kzalloc(sizeof(struct TCP_Server_Info), GFP_KERNEL);
if (srvTcp == NULL) { if (!srvTcp) {
rc = -ENOMEM; rc = -ENOMEM;
sock_release(csocket); sock_release(csocket);
kfree(volume_info.UNC); kfree(volume_info.UNC);
@ -1920,7 +1919,6 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
FreeXid(xid); FreeXid(xid);
return rc; return rc;
} else { } else {
memset(srvTcp, 0, sizeof (struct TCP_Server_Info));
memcpy(&srvTcp->addr.sockAddr, &sin_server, memcpy(&srvTcp->addr.sockAddr, &sin_server,
sizeof (struct sockaddr_in)); sizeof (struct sockaddr_in));
atomic_set(&srvTcp->inFlight, 0); atomic_set(&srvTcp->inFlight, 0);
@ -2529,8 +2527,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,
sesssetup_nomem: /* do not return an error on nomem for the info strings, sesssetup_nomem: /* do not return an error on nomem for the info strings,
since that could make reconnection harder, and since that could make reconnection harder, and
reconnection might be needed to free memory */ reconnection might be needed to free memory */
if (smb_buffer) cifs_buf_release(smb_buffer);
cifs_buf_release(smb_buffer);
return rc; return rc;
} }
@ -2868,8 +2865,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
rc = -EIO; rc = -EIO;
} }
if (smb_buffer) cifs_buf_release(smb_buffer);
cifs_buf_release(smb_buffer);
return rc; return rc;
} }
@ -3277,8 +3273,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
rc = -EIO; rc = -EIO;
} }
if (smb_buffer) cifs_buf_release(smb_buffer);
cifs_buf_release(smb_buffer);
return rc; return rc;
} }
@ -3446,8 +3441,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
ses->ipc_tid = smb_buffer_response->Tid; ses->ipc_tid = smb_buffer_response->Tid;
} }
if (smb_buffer) cifs_buf_release(smb_buffer);
cifs_buf_release(smb_buffer);
return rc; return rc;
} }