linux-cifs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pavel Shilovsky <piastryyy@gmail.com>
To: Ronnie Sahlberg <lsahlber@redhat.com>
Cc: linux-cifs <linux-cifs@vger.kernel.org>,
	Steve French <smfrench@gmail.com>,
	Pavel Shilovsky <pshilov@microsoft.com>
Subject: Re: [PATCH 2/6] cifs: pass flags down into wait_for_free_credits()
Date: Fri, 8 Mar 2019 16:54:20 -0800	[thread overview]
Message-ID: <CAKywueSf5k2BNKi_HbMpj8-a_Eg=T4Zwc_7HUujsKNc=mYdsxA@mail.gmail.com> (raw)
In-Reply-To: <20190308025823.24382-3-lsahlber@redhat.com>

чт, 7 мар. 2019 г. в 19:35, Ronnie Sahlberg <lsahlber@redhat.com>:
>
> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> ---
>  fs/cifs/transport.c | 30 ++++++++++++++----------------
>  1 file changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
> index 5c4becefde4b..8887db2cd582 100644
> --- a/fs/cifs/transport.c
> +++ b/fs/cifs/transport.c
> @@ -477,15 +477,24 @@ smb_send(struct TCP_Server_Info *server, struct smb_hdr *smb_buffer,
>  }
>
>  static int
> -wait_for_free_credits(struct TCP_Server_Info *server, const int timeout,
> -                     int *credits, unsigned int *instance)
> +wait_for_free_credits(struct TCP_Server_Info *server, const int flags,
> +                     unsigned int *instance)
>  {
>         int rc;
> +       int *credits;
> +       int optype;
> +
> +       optype = flags & CIFS_OP_MASK;
>
>         *instance = 0;
>
> +       credits = server->ops->get_credits_field(server, optype);
> +       /* Since an echo is already inflight, no need to wait to send another */
> +       if (*credits <= 0 && optype == CIFS_ECHO_OP)
> +               return -EAGAIN;
> +
>         spin_lock(&server->req_lock);
> -       if (timeout == CIFS_ASYNC_OP) {
> +       if ((flags & CIFS_TIMEOUT_MASK) == CIFS_ASYNC_OP) {
>                 /* oplock breaks must not be held up */
>                 server->in_flight++;
>                 *credits -= 1;
> @@ -516,7 +525,7 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int timeout,
>                          */
>
>                         /* update # of requests on the wire to server */
> -                       if (timeout != CIFS_BLOCKING_OP) {
> +                       if ((flags & CIFS_TIMEOUT_MASK) != CIFS_BLOCKING_OP) {
>                                 *credits -= 1;
>                                 server->in_flight++;
>                                 *instance = server->reconnect_instance;
> @@ -532,18 +541,7 @@ static int
>  wait_for_free_request(struct TCP_Server_Info *server, const int flags,
>                       unsigned int *instance)
>  {
> -       int *val;
> -       int timeout, optype;
> -
> -       timeout = flags & CIFS_TIMEOUT_MASK;
> -       optype = flags & CIFS_OP_MASK;
> -
> -       val = server->ops->get_credits_field(server, optype);
> -       /* Since an echo is already inflight, no need to wait to send another */
> -       if (*val <= 0 && optype == CIFS_ECHO_OP)
> -               return -EAGAIN;
> -
> -       return wait_for_free_credits(server, timeout, val, instance);
> +       return wait_for_free_credits(server, flags, instance);
>  }
>
>  int
> --
> 2.13.6
>

Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
--
Best regards,
Pavel Shilovsky

  reply	other threads:[~2019-03-09  0:54 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-08  2:58 [PATCH 0/6] cifs: simplify handling of credits for compounds Ronnie Sahlberg
2019-03-08  2:58 ` [PATCH 1/6] cifs: change wait_for_free_request() to take flags as argument Ronnie Sahlberg
2019-03-09  0:53   ` Pavel Shilovsky
2019-03-08  2:58 ` [PATCH 2/6] cifs: pass flags down into wait_for_free_credits() Ronnie Sahlberg
2019-03-09  0:54   ` Pavel Shilovsky [this message]
2019-03-08  2:58 ` [PATCH 3/6] cifs: wait_for_free_credits() make it possible to wait for >=1 credits Ronnie Sahlberg
2019-03-09  0:54   ` Pavel Shilovsky
2019-03-08  2:58 ` [PATCH 4/6] cifs: prevent starvation in wait_for_free_credits for multi-credit requests Ronnie Sahlberg
2019-03-09  0:55   ` Pavel Shilovsky
2019-03-08  2:58 ` [PATCH 5/6] cifs: add a timeout argument to wait_for_free_credits Ronnie Sahlberg
2019-03-09  0:58   ` Pavel Shilovsky
     [not found]     ` <CAH2r5ms3METKgX9sMet44r0RKdVAEe_x=vuB_6JZobJn95x4_Q@mail.gmail.com>
2019-03-09  1:06       ` Pavel Shilovsky
2019-03-10  2:21     ` Steve French
2019-03-08  2:58 ` [PATCH 6/6] cifs: simplify how we handle credits in compond_send_recv() Ronnie Sahlberg
2019-03-09  0:53   ` Pavel Shilovsky
2019-03-09 22:04     ` Steve French
  -- strict thread matches above, loose matches on Subject: below --
2019-03-06  4:15 [PATCH 0/6] cifs: simplify handling of credits for compounds Ronnie Sahlberg
2019-03-06  4:15 ` [PATCH 2/6] cifs: pass flags down into wait_for_free_credits() Ronnie Sahlberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAKywueSf5k2BNKi_HbMpj8-a_Eg=T4Zwc_7HUujsKNc=mYdsxA@mail.gmail.com' \
    --to=piastryyy@gmail.com \
    --cc=linux-cifs@vger.kernel.org \
    --cc=lsahlber@redhat.com \
    --cc=pshilov@microsoft.com \
    --cc=smfrench@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).