smb: client: fix zero rsize error messages

cifs_prepare_read() might be called with a disconnected channel, where
TCP_Server_Info::max_read is set to zero due to reconnect, so calling
->negotiate_rize() will set @rsize to default min IO size (64KiB) and
then logging

	CIFS: VFS: SMB: Zero rsize calculated, using minimum value
	65536

If the reconnect happens in cifsd thread, cifs_renegotiate_iosize()
will end up being called and then @rsize set to the expected value.

Since we can't rely on the value of @server->max_read by the time we
call cifs_prepare_read(), try to ->negotiate_rize() only if
@cifs_sb->ctx->rsize is zero.

Reported-by: Steve French <stfrench@microsoft.com>
Fixes: c59f7c9661b9 ("smb: client: ensure aligned IO sizes")
Signed-off-by: Paulo Alcantara (Red Hat) <pc@manguebit.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 851b74f557c10e5f14f014923bbbdbd31f6cf064..950aa4f912f5cdf0d2d185849055e55631abb007 100644 (file)
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -160,8 +160,10 @@ static int cifs_prepare_read(struct netfs_io_subrequest *subreq)
        server = cifs_pick_channel(tlink_tcon(req->cfile->tlink)->ses);
        rdata->server = server;
 
-       cifs_negotiate_rsize(server, cifs_sb->ctx,
-                            tlink_tcon(req->cfile->tlink));
+       if (cifs_sb->ctx->rsize == 0) {
+               cifs_negotiate_rsize(server, cifs_sb->ctx,
+                                    tlink_tcon(req->cfile->tlink));
+       }
 
        rc = server->ops->wait_mtu_credits(server, cifs_sb->ctx->rsize,
                                           &size, &rdata->credits);