From 1d37d0e8e2243e40a96096be1193cf2e2954a934 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 6 Dec 2008 13:12:34 +0100 Subject: [PATCH] --- yaml --- r: 121487 b: refs/heads/master c: 8fbbd365cc700e288fb6f9780b092c5afa4946e5 h: refs/heads/master i: 121485: 7775d784062ab2dd20edb116c832eb8e4b2dc583 121483: 4c9cc4a926080f787d7461e868d709b0cd6b5289 121479: f0a8d53e538931c7fcc8afda9b122a2595c9c02c 121471: 1d97de245a4628a7025443a1d5cb6805c0f71cee v: v3 --- [refs] | 2 +- trunk/fs/cifs/transport.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2e13e144cc90..611e010a0c9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d9c6d543165d1d492602c1371cb019040093584 +refs/heads/master: 8fbbd365cc700e288fb6f9780b092c5afa4946e5 diff --git a/trunk/fs/cifs/transport.c b/trunk/fs/cifs/transport.c index e80210693ff7..c98f929315f2 100644 --- a/trunk/fs/cifs/transport.c +++ b/trunk/fs/cifs/transport.c @@ -385,10 +385,14 @@ static int allocate_mid(struct cifsSesInfo *ses, struct smb_hdr *in_buf, { if (ses->server->tcpStatus == CifsExiting) { return -ENOENT; - } else if (ses->server->tcpStatus == CifsNeedReconnect) { + } + + if (ses->server->tcpStatus == CifsNeedReconnect) { cFYI(1, ("tcp session dead - return to caller to retry")); return -EAGAIN; - } else if (ses->status != CifsGood) { + } + + if (ses->status != CifsGood) { /* check if SMB session is bad because we are setting it up */ if ((in_buf->Command != SMB_COM_SESSION_SETUP_ANDX) && (in_buf->Command != SMB_COM_NEGOTIATE))