diff options
| author | Pavel Shilovsky <piastry@etersoft.ru> | 2012-03-23 19:28:03 +0100 |
|---|---|---|
| committer | Jeff Layton <jlayton@redhat.com> | 2012-03-23 19:28:03 +0100 |
| commit | 7c9421e1a9ce8d17816f480c3a5b4f2609442cd5 (patch) | |
| tree | 6131acccc9898629df21a5c5a3e75ccf717bf947 /fs/cifs/cifsglob.h | |
| parent | CIFS: Expand CurrentMid field (diff) | |
| download | linux-7c9421e1a9ce8d17816f480c3a5b4f2609442cd5.tar.xz linux-7c9421e1a9ce8d17816f480c3a5b4f2609442cd5.zip | |
CIFS: Change mid_q_entry structure fields
to be protocol-unspecific and big enough to keep both CIFS
and SMB2 values.
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Diffstat (limited to 'fs/cifs/cifsglob.h')
| -rw-r--r-- | fs/cifs/cifsglob.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index b213458b852a..d5ccd467a1d1 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -731,8 +731,8 @@ typedef void (mid_callback_t)(struct mid_q_entry *mid); /* one of these for every pending CIFS request to the server */ struct mid_q_entry { struct list_head qhead; /* mids waiting on reply from this server */ - __u16 mid; /* multiplex id */ - __u16 pid; /* process id */ + __u64 mid; /* multiplex id */ + __u32 pid; /* process id */ __u32 sequence_number; /* for CIFS signing */ unsigned long when_alloc; /* when mid was created */ #ifdef CONFIG_CIFS_STATS2 @@ -743,9 +743,9 @@ struct mid_q_entry { mid_callback_t *callback; /* call completion callback */ void *callback_data; /* general purpose pointer for callback */ void *resp_buf; /* pointer to received SMB header */ - int midState; /* wish this were enum but can not pass to wait_event */ - __u8 command; /* smb command code */ - bool largeBuf:1; /* if valid response, is pointer to large buf */ + int mid_state; /* wish this were enum but can not pass to wait_event */ + __le16 command; /* smb command code */ + bool large_buf:1; /* if valid response, is pointer to large buf */ bool multiRsp:1; /* multiple trans2 responses for one request */ bool multiEnd:1; /* both received */ }; |