kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[CIFS] Remove over-indented code in find_unc().

Browse source 
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French 2008-05-06 22:05:51 +00:00
parent a815752ac0
commit dea570e08a
1 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
fs/cifs/connect.c
View file

@ -1362,45 +1362,43 @@ find_unc(__be32 new_target_ip_addr, char *uncName, char *userName)
{
struct list_head *tmp;
struct cifsTconInfo *tcon;
__be32 old_ip;
read_lock(&GlobalSMBSeslock);
list_for_each(tmp, &GlobalTreeConnectionList) {
cFYI(1, ("Next tcon"));
tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList);
if (tcon->ses) {
if (tcon->ses->server) {
cFYI(1,
("old ip addr: %x == new ip %x ?",
tcon->ses->server->addr.sockAddr.sin_addr.
s_addr, new_target_ip_addr));
if (tcon->ses->server->addr.sockAddr.sin_addr.
s_addr == new_target_ip_addr) {
/* BB lock tcon, server and tcp session and increment use count here? */
/* found a match on the TCP session */
/* BB check if reconnection needed */
cFYI(1,
("IP match, old UNC: %s new: %s",
tcon->treeName, uncName));
if (strncmp
(tcon->treeName, uncName,
MAX_TREE_SIZE) == 0) {
cFYI(1,
("and old usr: %s new: %s",
tcon->treeName, uncName));
if (strncmp
(tcon->ses->userName,
userName,
MAX_USERNAME_SIZE) == 0) {
read_unlock(&GlobalSMBSeslock);
/* matched smb session
(user name */
return tcon;
}
}
}
}
}
if (!tcon->ses || !tcon->ses->server)
continue;
old_ip = tcon->ses->server->addr.sockAddr.sin_addr.s_addr;
cFYI(1, ("old ip addr: %x == new ip %x ?",
old_ip, new_target_ip_addr));
if (old_ip != new_target_ip_addr)
continue;
/* BB lock tcon, server, tcp session and increment use count? */
/* found a match on the TCP session */
/* BB check if reconnection needed */
cFYI(1, ("IP match, old UNC: %s new: %s",
tcon->treeName, uncName));
if (strncmp(tcon->treeName, uncName, MAX_TREE_SIZE))
continue;
cFYI(1, ("and old usr: %s new: %s",
tcon->treeName, uncName));
if (strncmp(tcon->ses->userName, userName, MAX_USERNAME_SIZE))
continue;
/* matched smb session (user name) */
read_unlock(&GlobalSMBSeslock);
return tcon;
}
read_unlock(&GlobalSMBSeslock);
return NULL;
}