From: Steve French <smfrench@gmail.com>
To: Ronnie Sahlberg <lsahlber@redhat.com>
Cc: linux-cifs <linux-cifs@vger.kernel.org>
Subject: Re: [PATCH] cifs: handle -EINTR in cifs_setattr
Date: Fri, 9 Oct 2020 00:43:07 -0500 [thread overview]
Message-ID: <CAH2r5ms0w1zZwo85RL8CbZKR40QMOPEvkf2iKeHXaHh0HYnagw@mail.gmail.com> (raw)
In-Reply-To: <20201008233256.27472-1-lsahlber@redhat.com>
merged updated patch into cifs-2.6.git for-next
On Thu, Oct 8, 2020 at 6:33 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote:
>
> RHBZ: 1848178
>
> Some calls that set attributes, like utimensat(), are not supposed to return
> -EINTR and thus do not have handlers for this in glibc which causes us
> to leak -EINTR to the applications which are also unprepared to handle it.
>
> For example tar will break if utimensat() return -EINTR and abort unpacking
> the archive. Other applications may break too.
>
> To handle this we add checks, and retry, for -EINTR in cifs_setattr()
>
> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> ---
> fs/cifs/inode.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
> index 3989d08396ac..0bd22c41a623 100644
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@ -2879,13 +2879,18 @@ cifs_setattr(struct dentry *direntry, struct iattr *attrs)
> {
> struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb);
> struct cifs_tcon *pTcon = cifs_sb_master_tcon(cifs_sb);
> + int rc, retries = 0;
>
> - if (pTcon->unix_ext)
> - return cifs_setattr_unix(direntry, attrs);
> -
> - return cifs_setattr_nounix(direntry, attrs);
> + do {
> + if (pTcon->unix_ext)
> + rc = cifs_setattr_unix(direntry, attrs);
> + else
> + rc = cifs_setattr_nounix(direntry, attrs);
> + retries++;
> + } while (is_retryable_error(rc) && retries < 2);
>
> /* BB: add cifs_setattr_legacy for really old servers */
> + return rc;
> }
>
> #if 0
> --
> 2.13.6
>
--
Thanks,
Steve
next prev parent reply other threads:[~2020-10-09 5:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 23:32 [PATCH] cifs: handle -EINTR in cifs_setattr Ronnie Sahlberg
2020-10-09 5:43 ` Steve French [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-10-06 5:26 Ronnie Sahlberg
2020-10-06 10:56 ` Aurélien Aptel
2020-10-06 22:22 ` ronnie sahlberg
2020-10-07 1:44 ` Steve French
2020-10-07 2:48 ` Steve French
2020-10-07 10:45 ` Aurélien Aptel
2020-10-08 23:31 ` ronnie sahlberg
2020-10-06 2:26 Ronnie Sahlberg
2020-10-06 4:32 ` Steve French
2020-10-06 5:06 ` Shyam Prasad N
2020-10-06 5:09 ` Shyam Prasad N
2020-10-06 5:23 ` 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=CAH2r5ms0w1zZwo85RL8CbZKR40QMOPEvkf2iKeHXaHh0HYnagw@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=linux-cifs@vger.kernel.org \
--cc=lsahlber@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.