aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/connect.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-04-24 07:57:47 -0400
committerSteve French <sfrench@us.ibm.com>2010-04-27 20:36:17 -0400
commitebe6aa5ac456a13213ed563863e70dd441618a97 (patch)
tree7703cf9325497f97731fb100a6521821f7fc08f9 /fs/cifs/connect.c
parentd54ff73259a852d4b3886dc586587fdef5e9c8de (diff)
cifs: eliminate "first_time" parm to CIFS_SessSetup
We can use the is_first_ses_reconnect() function to determine this. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r--fs/cifs/connect.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 7a47c7c5c7e3..9123c23bd1d9 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2878,7 +2878,6 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,
2878 struct nls_table *nls_info) 2878 struct nls_table *nls_info)
2879{ 2879{
2880 int rc = 0; 2880 int rc = 0;
2881 int first_time = 0;
2882 struct TCP_Server_Info *server = pSesInfo->server; 2881 struct TCP_Server_Info *server = pSesInfo->server;
2883 2882
2884 /* what if server changes its buffer size after dropping the session? */ 2883 /* what if server changes its buffer size after dropping the session? */
@@ -2899,7 +2898,6 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,
2899 spin_unlock(&GlobalMid_Lock); 2898 spin_unlock(&GlobalMid_Lock);
2900 2899
2901 } 2900 }
2902 first_time = 1;
2903 } 2901 }
2904 2902
2905 if (rc) 2903 if (rc)
@@ -2913,7 +2911,7 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,
2913 cFYI(1, "Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d", 2911 cFYI(1, "Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d",
2914 server->secMode, server->capabilities, server->timeAdj); 2912 server->secMode, server->capabilities, server->timeAdj);
2915 2913
2916 rc = CIFS_SessSetup(xid, pSesInfo, first_time, nls_info); 2914 rc = CIFS_SessSetup(xid, pSesInfo, nls_info);
2917 if (rc) { 2915 if (rc) {
2918 cERROR(1, "Send error in SessSetup = %d", rc); 2916 cERROR(1, "Send error in SessSetup = %d", rc);
2919 } else { 2917 } else {