cifs: Clean up unused variables in smb2pdu.c

There are multiple unused variables struct TCP_Server_Info *server
defined in many methods in smb2pdu.c. They should be removed and related
logic simplified.

Signed-off-by: Christos Gkekas <chris.gekas@gmail.com>
Signed-off-by: Steve French <smfrench@gmail.com>

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index c3c8eaff56dfd898e3a5a11d673746de182e4bd8..5fb2fc2d0080b6e62fd0ad10e1a9c90c08308f2d 100644 (file)
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -1167,15 +1167,12 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,
        int rc = 0;
        int resp_buftype;
        int unc_path_len;
-       struct TCP_Server_Info *server;
        __le16 *unc_path = NULL;
        int flags = 0;
 
        cifs_dbg(FYI, "TCON\n");
 
-       if ((ses->server) && tree)
-               server = ses->server;
-       else
+       if (!(ses->server) || !tree)
                return -EIO;
 
        unc_path = kmalloc(MAX_SHARENAME_LENGTH * 2, GFP_KERNEL);
@@ -1294,15 +1291,12 @@ SMB2_tdis(const unsigned int xid, struct cifs_tcon *tcon)
 {
        struct smb2_tree_disconnect_req *req; /* response is trivial */
        int rc = 0;
-       struct TCP_Server_Info *server;
        struct cifs_ses *ses = tcon->ses;
        int flags = 0;
 
        cifs_dbg(FYI, "Tree Disconnect\n");
 
-       if (ses && (ses->server))
-               server = ses->server;
-       else
+       if (!ses || !(ses->server))
                return -EIO;
 
        if ((tcon->need_reconnect) || (tcon->ses->need_reconnect))
@@ -1794,7 +1788,6 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
        struct smb2_ioctl_req *req;
        struct smb2_ioctl_rsp *rsp;
        struct smb2_sync_hdr *shdr;
-       struct TCP_Server_Info *server;
        struct cifs_ses *ses;
        struct kvec iov[2];
        struct kvec rsp_iov;
@@ -1817,9 +1810,7 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
        else
                return -EIO;
 
-       if (ses && (ses->server))
-               server = ses->server;
-       else
+       if (!ses || !(ses->server))
                return -EIO;
 
        rc = small_smb2_init(SMB2_IOCTL, tcon, (void **) &req);
@@ -1977,7 +1968,6 @@ SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
 {
        struct smb2_close_req *req;
        struct smb2_close_rsp *rsp;
-       struct TCP_Server_Info *server;
        struct cifs_ses *ses = tcon->ses;
        struct kvec iov[1];
        struct kvec rsp_iov;
@@ -1987,9 +1977,7 @@ SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
 
        cifs_dbg(FYI, "Close\n");
 
-       if (ses && (ses->server))
-               server = ses->server;
-       else
+       if (!ses || !(ses->server))
                return -EIO;
 
        rc = small_smb2_init(SMB2_CLOSE, tcon, (void **) &req);
@@ -2091,15 +2079,12 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,
        struct kvec rsp_iov;
        int rc = 0;
        int resp_buftype;
-       struct TCP_Server_Info *server;
        struct cifs_ses *ses = tcon->ses;
        int flags = 0;
 
        cifs_dbg(FYI, "Query Info\n");
 
-       if (ses && (ses->server))
-               server = ses->server;
-       else
+       if (!ses || !(ses->server))
                return -EIO;
 
        rc = small_smb2_init(SMB2_QUERY_INFO, tcon, (void **) &req);
@@ -2311,7 +2296,6 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
           u64 volatile_fid)
 {
        struct smb2_flush_req *req;
-       struct TCP_Server_Info *server;
        struct cifs_ses *ses = tcon->ses;
        struct kvec iov[1];
        struct kvec rsp_iov;
@@ -2321,9 +2305,7 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
 
        cifs_dbg(FYI, "Flush\n");
 
-       if (ses && (ses->server))
-               server = ses->server;
-       else
+       if (!ses || !(ses->server))
                return -EIO;
 
        rc = small_smb2_init(SMB2_FLUSH, tcon, (void **) &req);
@@ -3011,13 +2993,10 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon,
        int rc = 0;
        int resp_buftype;
        unsigned int i;
-       struct TCP_Server_Info *server;
        struct cifs_ses *ses = tcon->ses;
        int flags = 0;
 
-       if (ses && (ses->server))
-               server = ses->server;
-       else
+       if (!ses || !(ses->server))
                return -EIO;
 
        if (!num)