From: "Schumaker, Anna" <Anna.Schumaker@netapp.com>
To: "olga.kornievskaia@gmail.com" <olga.kornievskaia@gmail.com>,
"trond.myklebust@hammerspace.com"
<trond.myklebust@hammerspace.com>
Cc: "linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH 1/1] NFSv4.2 fix unnecessary retry in nfs4_copy_file_range
Date: Fri, 11 Jan 2019 19:04:27 +0000 [thread overview]
Message-ID: <769dd5d01d37b7e4a9f81fa160fdab109a912c88.camel@netapp.com> (raw)
In-Reply-To: <20190108175532.2348-1-olga.kornievskaia@gmail.com>
Hi Olga,
On Tue, 2019-01-08 at 12:55 -0500, Olga Kornievskaia wrote:
> Currently nfs42_proc_copy_file_range() can not return EAGAIN.
>
> Fixes: e4648aa4f98a ("NFS recover from destination server reboot for copies")
> Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
> ---
> fs/nfs/nfs4file.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
> index 46d691b..81554af 100644
> --- a/fs/nfs/nfs4file.c
> +++ b/fs/nfs/nfs4file.c
> @@ -137,11 +137,7 @@ static ssize_t nfs4_copy_file_range(struct file *file_in,
> loff_t pos_in,
>
> if (file_inode(file_in) == file_inode(file_out))
> return -EINVAL;
> -retry:
> - ret = nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);
> - if (ret == -EAGAIN)
> - goto retry;
> - return ret;
> + return nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);
I think this is the only user of the variable "ret", so can you remove its
declaration at the top of this function too?
CC [M] fs/nfs/nfs4file.o
fs/nfs/nfs4file.c: In function ‘nfs4_copy_file_range’:
fs/nfs/nfs4file.c:136:10: error: unused variable ‘ret’ [-Werror=unused-variable]
ssize_t ret;
^~~
cc1: all warnings being treated as errors
Thanks,
Anna
> }
>
> static loff_t nfs4_file_llseek(struct file *filep, loff_t offset, int whence)
prev parent reply other threads:[~2019-01-11 19:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-08 17:55 [PATCH 1/1] NFSv4.2 fix unnecessary retry in nfs4_copy_file_range Olga Kornievskaia
2019-01-11 19:04 ` Schumaker, Anna [this message]
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=769dd5d01d37b7e4a9f81fa160fdab109a912c88.camel@netapp.com \
--to=anna.schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=olga.kornievskaia@gmail.com \
--cc=trond.myklebust@hammerspace.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).