diff options
author | Steve French <sfrench@us.ibm.com> | 2008-08-08 23:10:16 +0200 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-08-08 23:10:16 +0200 |
commit | ad8b15f0ffc297cdd6c65ef7552b3b8abd11a401 (patch) | |
tree | ee3fedbfb1e3be88898de6297e82f7e89cbac17d /fs/cifs/connect.c | |
parent | turn cifs_setattr into a multiplexor that calls the correct function (diff) | |
download | linux-ad8b15f0ffc297cdd6c65ef7552b3b8abd11a401.tar.xz linux-ad8b15f0ffc297cdd6c65ef7552b3b8abd11a401.zip |
[CIFS] list entry can not return null
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r-- | fs/cifs/connect.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index ff4345db7201..0711db65afe8 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -151,7 +151,7 @@ cifs_reconnect(struct TCP_Server_Info *server) } list_for_each(tmp, &GlobalTreeConnectionList) { tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList); - if ((tcon) && (tcon->ses) && (tcon->ses->server == server)) + if ((tcon->ses) && (tcon->ses->server == server)) tcon->tidStatus = CifsNeedReconnect; } read_unlock(&GlobalSMBSeslock); @@ -173,14 +173,12 @@ cifs_reconnect(struct TCP_Server_Info *server) mid_entry = list_entry(tmp, struct mid_q_entry, qhead); - if (mid_entry) { - if (mid_entry->midState == MID_REQUEST_SUBMITTED) { + if (mid_entry->midState == MID_REQUEST_SUBMITTED) { /* Mark other intransit requests as needing retry so we do not immediately mark the session bad again (ie after we reconnect below) as they timeout too */ - mid_entry->midState = MID_RETRY_NEEDED; - } + mid_entry->midState = MID_RETRY_NEEDED; } } spin_unlock(&GlobalMid_Lock); |