korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 22:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

CIFS: Add echo request support for SMB2

Browse Source 
Signed-off-by: Pavel Shilovsky <piastryyy@gmail.com>
Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
Pavel Shilovsky 2012-07-12 18:30:44 +04:00
parent f6d7617862
commit 9094fad1ed
6 changed files with 73 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/cifs/cifsglob.h
View File

@ -73,6 +73,9 @@
/* (max path length + 1 for null) * 2 for unicode */ /* (max path length + 1 for null) * 2 for unicode */
#define MAX_NAME 514 #define MAX_NAME 514
/* SMB echo "timeout" -- FIXME: tunable? */
#define SMB_ECHO_INTERVAL (60 * HZ)
#include "cifspdu.h" #include "cifspdu.h"
#ifndef XATTR_DOS_ATTRIB #ifndef XATTR_DOS_ATTRIB

3
fs/cifs/connect.c
View File

@ -56,9 +56,6 @@
#define CIFS_PORT 445 #define CIFS_PORT 445
#define RFC1001_PORT 139 #define RFC1001_PORT 139
/* SMB echo "timeout" -- FIXME: tunable? */
#define SMB_ECHO_INTERVAL (60 * HZ)
extern mempool_t *cifs_req_poolp; extern mempool_t *cifs_req_poolp;
/* FIXME: should these be tunable? */ /* FIXME: should these be tunable? */

8
fs/cifs/smb2ops.c
View File

@ -207,6 +207,12 @@ smb2_build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
return NULL; return NULL;
} }
static bool
smb2_can_echo(struct TCP_Server_Info *server)
{
return server->echoes;
}
struct smb_version_operations smb21_operations = { struct smb_version_operations smb21_operations = {
.setup_request = smb2_setup_request, .setup_request = smb2_setup_request,
.setup_async_request = smb2_setup_async_request, .setup_async_request = smb2_setup_async_request,
@ -226,6 +232,8 @@ struct smb_version_operations smb21_operations = {
.tree_connect = SMB2_tcon, .tree_connect = SMB2_tcon,
.tree_disconnect = SMB2_tdis, .tree_disconnect = SMB2_tdis,
.is_path_accessible = smb2_is_path_accessible, .is_path_accessible = smb2_is_path_accessible,
.can_echo = smb2_can_echo,
.echo = SMB2_echo,
.query_path_info = smb2_query_path_info, .query_path_info = smb2_query_path_info,
.get_srv_inum = smb2_get_srv_inum, .get_srv_inum = smb2_get_srv_inum,
.build_path_to_root = smb2_build_path_to_root, .build_path_to_root = smb2_build_path_to_root,

49
fs/cifs/smb2pdu.c
View File

@ -1074,3 +1074,52 @@ qinf_exit:
free_rsp_buf(resp_buftype, rsp); free_rsp_buf(resp_buftype, rsp);
return rc; return rc;
} }
/*
* This is a no-op for now. We're not really interested in the reply, but
* rather in the fact that the server sent one and that server->lstrp
* gets updated.
*
* FIXME: maybe we should consider checking that the reply matches request?
*/
static void
smb2_echo_callback(struct mid_q_entry *mid)
{
struct TCP_Server_Info *server = mid->callback_data;
struct smb2_echo_rsp *smb2 = (struct smb2_echo_rsp *)mid->resp_buf;
unsigned int credits_received = 1;
if (mid->mid_state == MID_RESPONSE_RECEIVED)
credits_received = le16_to_cpu(smb2->hdr.CreditRequest);
DeleteMidQEntry(mid);
add_credits(server, credits_received, CIFS_ECHO_OP);
}
int
SMB2_echo(struct TCP_Server_Info *server)
{
struct smb2_echo_req *req;
int rc = 0;
struct kvec iov;
cFYI(1, "In echo request");
rc = small_smb2_init(SMB2_ECHO, NULL, (void **)&req);
if (rc)
return rc;
req->hdr.CreditRequest = cpu_to_le16(1);
iov.iov_base = (char *)req;
/* 4 for rfc1002 length field */
iov.iov_len = get_rfc1002_length(req) + 4;
rc = cifs_call_async(server, &iov, 1, NULL, smb2_echo_callback, server,
CIFS_ECHO_OP);
if (rc)
cFYI(1, "Echo request failed: %d", rc);
cifs_small_buf_release(req);
return rc;
}

12
fs/cifs/smb2pdu.h
View File

@ -448,6 +448,18 @@ struct smb2_close_rsp {
__le32 Attributes; __le32 Attributes;
} __packed; } __packed;
struct smb2_echo_req {
struct smb2_hdr hdr;
__le16 StructureSize; /* Must be 4 */
__u16 Reserved;
} __packed;
struct smb2_echo_rsp {
struct smb2_hdr hdr;
__le16 StructureSize; /* Must be 4 */
__u16 Reserved;
} __packed;
/* Possible InfoType values */ /* Possible InfoType values */
#define SMB2_O_INFO_FILE 0x01 #define SMB2_O_INFO_FILE 0x01
#define SMB2_O_INFO_FILESYSTEM 0x02 #define SMB2_O_INFO_FILESYSTEM 0x02

1
fs/cifs/smb2proto.h
View File

@ -73,5 +73,6 @@ extern int SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
extern int SMB2_query_info(const unsigned int xid, struct cifs_tcon *tcon, extern int SMB2_query_info(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_file_id, u64 volatile_file_id, u64 persistent_file_id, u64 volatile_file_id,
struct smb2_file_all_info *data); struct smb2_file_all_info *data);
extern int SMB2_echo(struct TCP_Server_Info *server);
#endif /* _SMB2PROTO_H */ #endif /* _SMB2PROTO_H */