From: "Steve French" <smfrench@gmail.com>
To: "Cyrill Gorcunov" <gorcunov@gmail.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [patch 1/2] cifs - find_unc cleanup
Date: Tue, 6 May 2008 17:06:26 -0500 [thread overview]
Message-ID: <524f69650805061506g55bdf6b0w7d5b936b7ec8bad4@mail.gmail.com> (raw)
In-Reply-To: <4819e79f.0c58560a.0f2c.ffff9899@mx.google.com>
merged
On Thu, May 1, 2008 at 10:48 AM, Cyrill Gorcunov <gorcunov@gmail.com> wrote:
> This patch is to remove too indented code in find_unc
>
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
>
> Index: linux-2.6.git/fs/cifs/connect.c
> ===================================================================
> --- linux-2.6.git.orig/fs/cifs/connect.c 2008-05-01 18:21:38.000000000 +0400
> +++ linux-2.6.git/fs/cifs/connect.c 2008-05-01 19:02:51.000000000 +0400
> @@ -1362,45 +1362,43 @@ find_unc(__be32 new_target_ip_addr, char
> {
> 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 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))
> + 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;
> }
>
> --
>
--
Thanks,
Steve
next prev parent reply other threads:[~2008-05-06 22:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080501154830.235254575@gmail.com>
2008-05-01 15:48 ` Cyrill Gorcunov
2008-05-06 22:06 ` Steve French [this message]
2008-05-01 15:48 ` [patch 2/2] cifs - cifs_find_tcp_session cleanup Cyrill Gorcunov
2008-05-06 22:07 ` Steve French
2008-05-07 4:17 ` Cyrill Gorcunov
2008-05-07 5:48 ` Cyrill Gorcunov
2008-05-09 18:55 ` Steve French
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=524f69650805061506g55bdf6b0w7d5b936b7ec8bad4@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=gorcunov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®