From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753490AbdKEFtP (ORCPT ); Sun, 5 Nov 2017 01:49:15 -0400 Received: from a2nlsmtp01-02.prod.iad2.secureserver.net ([198.71.225.36]:52056 "EHLO a2nlsmtp01-02.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750829AbdKEFpx (ORCPT ); Sun, 5 Nov 2017 01:45:53 -0400 x-originating-ip: 107.180.71.197 From: Long Li To: Steve French , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, Christoph Hellwig , Tom Talpey , Matthew Wilcox , Stephen Hemminger Cc: Long Li Subject: [Patch v6 17/22] CIFS: SMBD: Upper layer sends data via RDMA send Date: Sat, 4 Nov 2017 22:43:59 -0700 Message-Id: <20171105054404.23886-18-longli@exchange.microsoft.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171105054404.23886-1-longli@exchange.microsoft.com> References: <20171105054404.23886-1-longli@exchange.microsoft.com> X-CMAE-Envelope: MS4wfLt/Fmm7bBXtuCTZSHbe3ecTRHnP6zT1e9FlCgDcT8AEPxAp+4Fhi+ucmgpjWCu73ff+NwD7M1fomogWdHsdnjEVdtgkQluuy5W8reh43g/b2ipGSXKB L2anpbL0H7i5WdfK89rKiXB/l6YEKdYmLY5IkfQAgzFP7NyZZ4jBFswVaWeyvwp+yVoUMt6ddDG2yw037KGN+kauiWUKfLkKG9JCGq6uYBqDucg4hQpwxxvS W5D1kTTOipnZO43rGnruf+W0+/xYpOoWm0gJyR5nZM+970oCFTfo+yoSCkUSVr63uGdd1Ty5gaKPtc/tyHr65a9Ig1GNs2sIr378ftUhgCQvm8gIete8KftE Wl1eXnoEl/TJ1s8eAiteGgMHmb42s0+6YCqISL+WQtIKm8WUZ7R1KsL6wnYqBanD2HzJp4pXAesz480myXaDGvqD1WkRRJbkKhjGMpdoUSEpZAJ8El7qVIkz 1PQSx/OBjAGA25gv8S498ODmmudds/a5gx/1AA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Long Li With SMB Direct connected, use it for sending data via RDMA send. Signed-off-by: Long Li --- fs/cifs/transport.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 7efbab0..1b51d08 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -37,6 +37,9 @@ #include "cifsglob.h" #include "cifsproto.h" #include "cifs_debug.h" +#ifdef CONFIG_CIFS_SMB_DIRECT +#include "smbdirect.h" +#endif void cifs_wake_up_task(struct mid_q_entry *mid) @@ -229,7 +232,12 @@ __smb_send_rqst(struct TCP_Server_Info *server, struct smb_rqst *rqst) struct socket *ssocket = server->ssocket; struct msghdr smb_msg; int val = 1; - +#ifdef CONFIG_CIFS_SMB_DIRECT + if (server->smbd_conn) { + rc = smbd_send(server->smbd_conn, rqst); + goto smbd_done; + } +#endif if (ssocket == NULL) return -ENOTSOCK; @@ -298,7 +306,9 @@ __smb_send_rqst(struct TCP_Server_Info *server, struct smb_rqst *rqst) */ server->tcpStatus = CifsNeedReconnect; } - +#ifdef CONFIG_CIFS_SMB_DIRECT +smbd_done: +#endif if (rc < 0 && rc != -EINTR) cifs_dbg(VFS, "Error %d sending data on socket to server\n", rc); -- 2.7.4