CIFS: Add SMB2 r/wsize negotiating

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

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index d81e1daeb8f0102d286083f56a9cd59df32a8cc6..20afb756e97a7a7a86743ad1cdcf4b8ac5c0d74d 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -17,6 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include <linux/pagemap.h>
 #include "cifsglob.h"
 #include "smb2pdu.h"
 #include "smb2proto.h"
@@ -157,6 +158,48 @@ smb2_negotiate(const unsigned int xid, struct cifs_ses *ses)
        return rc;
 }
 
+static unsigned int
+smb2_negotiate_wsize(struct cifs_tcon *tcon, struct smb_vol *volume_info)
+{
+       struct TCP_Server_Info *server = tcon->ses->server;
+       unsigned int wsize;
+
+       /* start with specified wsize, or default */
+       wsize = volume_info->wsize ? volume_info->wsize : CIFS_DEFAULT_IOSIZE;
+       wsize = min_t(unsigned int, wsize, server->max_write);
+       /*
+        * limit write size to 2 ** 16, because we don't support multicredit
+        * requests now.
+        */
+       wsize = min_t(unsigned int, wsize, 2 << 15);
+
+       /* limit to the amount that we can kmap at once */
+       wsize = min_t(unsigned int, wsize, CIFS_KMAP_SIZE_LIMIT);
+
+       return wsize;
+}
+
+static unsigned int
+smb2_negotiate_rsize(struct cifs_tcon *tcon, struct smb_vol *volume_info)
+{
+       struct TCP_Server_Info *server = tcon->ses->server;
+       unsigned int rsize;
+
+       /* start with specified rsize, or default */
+       rsize = volume_info->rsize ? volume_info->rsize : CIFS_DEFAULT_IOSIZE;
+       rsize = min_t(unsigned int, rsize, server->max_read);
+       /*
+        * limit write size to 2 ** 16, because we don't support multicredit
+        * requests now.
+        */
+       rsize = min_t(unsigned int, rsize, 2 << 15);
+
+       /* limit to the amount that we can kmap at once */
+       rsize = min_t(unsigned int, rsize, CIFS_KMAP_SIZE_LIMIT);
+
+       return rsize;
+}
+
 static int
 smb2_is_path_accessible(const unsigned int xid, struct cifs_tcon *tcon,
                        struct cifs_sb_info *cifs_sb, const char *full_path)
@@ -352,6 +395,8 @@ struct smb_version_operations smb21_operations = {
        .print_stats = smb2_print_stats,
        .need_neg = smb2_need_neg,
        .negotiate = smb2_negotiate,
+       .negotiate_wsize = smb2_negotiate_wsize,
+       .negotiate_rsize = smb2_negotiate_rsize,
        .sess_setup = SMB2_sess_setup,
        .logoff = SMB2_logoff,
        .tree_connect = SMB2_tcon,