CIFS: Move echo code to osp struct

Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>

3 files changed, 11 insertions, 4 deletions

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 5e4d1c56767d..0c53a8339253 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -234,6 +234,10 @@ struct smb_version_operations {
         /* build a full path to the root of the mount */
         char * (*build_path_to_root)(struct smb_vol *, struct cifs_sb_info *,
                                      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 {
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 7b4bc1e0b08e..a83ed766aa94 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -406,15 +406,17 @@ cifs_echo_request(struct work_struct *work)
                                         struct TCP_Server_Info, echo.work);
 
         /*
-         * We cannot send an echo until the NEGOTIATE_PROTOCOL request is
-         * done, which is indicated by maxBuf != 0. Also, no need to ping if
-         * we got a response recently
+         * We cannot send an echo if it is disabled or until the
+         * NEGOTIATE_PROTOCOL request is done, which is indicated by
+         * 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) ||
+            (server->ops->can_echo && !server->ops->can_echo(server)) ||
             time_before(jiffies, server->lstrp + SMB_ECHO_INTERVAL - HZ))
                 goto requeue_echo;
 
-        rc = CIFSSMBEcho(server);
+        rc = server->ops->echo ? server->ops->echo(server) : -ENOSYS;
         if (rc)
                 cFYI(1, "Unable to send echo request to server: %s",
                         server->hostname);
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index 7bd4973591de..c9326b4ec6cd 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -551,6 +551,7 @@ struct smb_version_operations smb1_operations = {
         .query_path_info = cifs_query_path_info,
         .get_srv_inum = cifs_get_srv_inum,
         .build_path_to_root = cifs_build_path_to_root,
+        .echo = CIFSSMBEcho,
 };
 
 struct smb_version_values smb1_values = {