openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

CIFS: Move echo code to osp struct 

Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
Pavel Shilovsky 2012-05-25 14:47:16 +04:00
parent c95b8eeda3
commit f6d7617862
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/cifs/cifsglob.h
View File

@ -234,6 +234,10 @@ struct smb_version_operations {
/* build a full path to the root of the mount */ /* build a full path to the root of the mount */
char * (*build_path_to_root)(struct smb_vol *, struct cifs_sb_info *, char * (*build_path_to_root)(struct smb_vol *, struct cifs_sb_info *,
struct cifs_tcon *); struct cifs_tcon *);
/* check if we can send an echo or nor */
bool (*can_echo)(struct TCP_Server_Info *);
/* send echo request */
int (*echo)(struct TCP_Server_Info *);
}; };
struct smb_version_values { struct smb_version_values {

10
fs/cifs/connect.c
View File

@ -406,15 +406,17 @@ cifs_echo_request(struct work_struct *work)
struct TCP_Server_Info, echo.work); struct TCP_Server_Info, echo.work);
/* /*
* We cannot send an echo until the NEGOTIATE_PROTOCOL request is * We cannot send an echo if it is disabled or until the
* done, which is indicated by maxBuf != 0. Also, no need to ping if * NEGOTIATE_PROTOCOL request is done, which is indicated by
* we got a response recently * server->ops->need_neg() == true. Also, no need to ping if
* we got a response recently.
*/ */
if (!server->ops->need_neg || server->ops->need_neg(server) || if (!server->ops->need_neg || server->ops->need_neg(server) ||
(server->ops->can_echo && !server->ops->can_echo(server)) ||
time_before(jiffies, server->lstrp + SMB_ECHO_INTERVAL - HZ)) time_before(jiffies, server->lstrp + SMB_ECHO_INTERVAL - HZ))
goto requeue_echo; goto requeue_echo;
rc = CIFSSMBEcho(server); rc = server->ops->echo ? server->ops->echo(server) : -ENOSYS;
if (rc) if (rc)
cFYI(1, "Unable to send echo request to server: %s", cFYI(1, "Unable to send echo request to server: %s",
server->hostname); server->hostname);

1
fs/cifs/smb1ops.c
View File

@ -551,6 +551,7 @@ struct smb_version_operations smb1_operations = {
.query_path_info = cifs_query_path_info, .query_path_info = cifs_query_path_info,
.get_srv_inum = cifs_get_srv_inum, .get_srv_inum = cifs_get_srv_inum,
.build_path_to_root = cifs_build_path_to_root, .build_path_to_root = cifs_build_path_to_root,
.echo = CIFSSMBEcho,
}; };
struct smb_version_values smb1_values = { struct smb_version_values smb1_values = {