* [PATCH] NFS: simplify check for freeing cn_resp
@ 2022-01-16 14:43 trix
2022-01-16 15:47 ` Trond Myklebust
0 siblings, 1 reply; 3+ messages in thread
From: trix @ 2022-01-16 14:43 UTC (permalink / raw)
To: trond.myklebust, anna.schumaker; +Cc: linux-nfs, linux-kernel, Tom Rix
From: Tom Rix <trix@redhat.com>
nfs42_files_from_same_server() is called to check if freeing
cn_resp is required. Instead of calling a function, check
the pointer.
Signed-off-by: Tom Rix <trix@redhat.com>
---
fs/nfs/nfs4file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index e79ae4cbc395e..677631ea4cfb3 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -180,7 +180,7 @@ static ssize_t __nfs4_copy_file_range(struct file *file_in, loff_t pos_in,
ret = nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count,
nss, cnrs, sync);
out:
- if (!nfs42_files_from_same_server(file_in, file_out))
+ if (cn_resp)
kfree(cn_resp);
if (ret == -EAGAIN)
goto retry;
--
2.26.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] NFS: simplify check for freeing cn_resp
2022-01-16 14:43 [PATCH] NFS: simplify check for freeing cn_resp trix
@ 2022-01-16 15:47 ` Trond Myklebust
2022-01-16 16:26 ` Tom Rix
0 siblings, 1 reply; 3+ messages in thread
From: Trond Myklebust @ 2022-01-16 15:47 UTC (permalink / raw)
To: anna.schumaker@netapp.com, trix@redhat.com
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Hi Tom,
On Sun, 2022-01-16 at 06:43 -0800, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
>
> nfs42_files_from_same_server() is called to check if freeing
> cn_resp is required. Instead of calling a function, check
> the pointer.
>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
> fs/nfs/nfs4file.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
> index e79ae4cbc395e..677631ea4cfb3 100644
> --- a/fs/nfs/nfs4file.c
> +++ b/fs/nfs/nfs4file.c
> @@ -180,7 +180,7 @@ static ssize_t __nfs4_copy_file_range(struct file
> *file_in, loff_t pos_in,
> ret = nfs42_proc_copy(file_in, pos_in, file_out, pos_out,
> count,
> nss, cnrs, sync);
> out:
> - if (!nfs42_files_from_same_server(file_in, file_out))
> + if (cn_resp)
> kfree(cn_resp);
The kernel convention in these circumstances is to just skip the NULL
pointer check, since kfree() does that anyway.
> if (ret == -EAGAIN)
> goto retry;
--
Trond Myklebust
Linux NFS client maintainer, Hammerspace
trond.myklebust@hammerspace.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] NFS: simplify check for freeing cn_resp
2022-01-16 15:47 ` Trond Myklebust
@ 2022-01-16 16:26 ` Tom Rix
0 siblings, 0 replies; 3+ messages in thread
From: Tom Rix @ 2022-01-16 16:26 UTC (permalink / raw)
To: Trond Myklebust, anna.schumaker@netapp.com
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
On 1/16/22 7:47 AM, Trond Myklebust wrote:
> Hi Tom,
>
> On Sun, 2022-01-16 at 06:43 -0800, trix@redhat.com wrote:
>> From: Tom Rix <trix@redhat.com>
>>
>> nfs42_files_from_same_server() is called to check if freeing
>> cn_resp is required. Instead of calling a function, check
>> the pointer.
>>
>> Signed-off-by: Tom Rix <trix@redhat.com>
>> ---
>> fs/nfs/nfs4file.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
>> index e79ae4cbc395e..677631ea4cfb3 100644
>> --- a/fs/nfs/nfs4file.c
>> +++ b/fs/nfs/nfs4file.c
>> @@ -180,7 +180,7 @@ static ssize_t __nfs4_copy_file_range(struct file
>> *file_in, loff_t pos_in,
>> ret = nfs42_proc_copy(file_in, pos_in, file_out, pos_out,
>> count,
>> nss, cnrs, sync);
>> out:
>> - if (!nfs42_files_from_same_server(file_in, file_out))
>> + if (cn_resp)
>> kfree(cn_resp);
> The kernel convention in these circumstances is to just skip the NULL
> pointer check, since kfree() does that anyway.
Yes. I'll respin.
Tom
>
>> if (ret == -EAGAIN)
>> goto retry;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-16 16:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-16 14:43 [PATCH] NFS: simplify check for freeing cn_resp trix
2022-01-16 15:47 ` Trond Myklebust
2022-01-16 16:26 ` Tom Rix
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox