cifs: remove unused SMB session pointer from struct mid_q_entry

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index c57c0565547fa99058e9a192796123a419309066..82e28f5515c8de441b42f86d6fbde91a51f91ada 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -422,7 +422,6 @@ struct mid_q_entry {
        unsigned long when_sent; /* time when smb send finished */
        unsigned long when_received; /* when demux complete (taken off wire) */
 #endif
-       struct cifsSesInfo *ses;        /* smb was sent to this server */
        struct task_struct *tsk;        /* task waiting for response */
        struct smb_hdr *resp_buf;       /* response buffer */
        int midState;   /* wish this were enum but can not pass to wait_event */

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index ff8243a8fe3e955757cf087d53c6dbd5bc6befc1..8e0d1c397c73c2cdac65b5e90aa33a22987a896f 100644 (file)
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -37,15 +37,11 @@ extern mempool_t *cifs_mid_poolp;
 extern struct kmem_cache *cifs_oplock_cachep;
 
 static struct mid_q_entry *
-AllocMidQEntry(const struct smb_hdr *smb_buffer, struct cifsSesInfo *ses)
+AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)
 {
        struct mid_q_entry *temp;
 
-       if (ses == NULL) {
-               cERROR(1, ("Null session passed in to AllocMidQEntry"));
-               return NULL;
-       }
-       if (ses->server == NULL) {
+       if (server == NULL) {
                cERROR(1, ("Null TCP session in AllocMidQEntry"));
                return NULL;
        }
@@ -62,12 +58,11 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct cifsSesInfo *ses)
        /*      do_gettimeofday(&temp->when_sent);*/ /* easier to use jiffies */
                /* when mid allocated can be before when sent */
                temp->when_alloc = jiffies;
-               temp->ses = ses;
                temp->tsk = current;
        }
 
        spin_lock(&GlobalMid_Lock);
-       list_add_tail(&temp->qhead, &ses->server->pending_mid_q);
+       list_add_tail(&temp->qhead, &server->pending_mid_q);
        atomic_inc(&midCount);
        temp->midState = MID_REQUEST_ALLOCATED;
        spin_unlock(&GlobalMid_Lock);
@@ -400,7 +395,7 @@ static int allocate_mid(struct cifsSesInfo *ses, struct smb_hdr *in_buf,
                        return -EAGAIN;
                /* else ok - we are setting up session */
        }
-       *ppmidQ = AllocMidQEntry(in_buf, ses);
+       *ppmidQ = AllocMidQEntry(in_buf, ses->server);
        if (*ppmidQ == NULL)
                return -ENOMEM;
        return 0;