2010-10-05 16:47:23

by Pavel Emelyanov

Subject: [PATCH] sunrpc: Remove useless if (task == NULL) from xprt_reserve_xprt

The task in question is dereferenced above (and is actually never NULL).

Signed-off-by: Pavel Emelyanov <[email protected]>
---
net/sunrpc/xprt.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 953206d..64a4a94 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -199,8 +199,6 @@ int xprt_reserve_xprt(struct rpc_task *task)
if (test_and_set_bit(XPRT_LOCKED, &xprt->state)) {
if (task == xprt->snd_task)
return 1;
- if (task == NULL)
- return 0;
goto out_sleep;
}
xprt->snd_task = task;
--
1.5.5.6

2010-10-06 09:46:57

by Pavel Emelyanov

Subject: Re: [PATCH] sunrpc: Remove useless if (task == NULL) from xprt_reserve_xprt

On 10/06/2010 02:46 AM, J. Bruce Fields wrote:
> On Tue, Oct 05, 2010 at 08:47:16PM +0400, Pavel Emelyanov wrote:
>> The task in question is dereferenced above (and is actually never NULL).
>
> Makes sense to me.
>
> (But probably it should go through Trond unless there's some dependency
> on your patches in my tree.)

No, no dependency at all. It's OK if this goes through Trond's tree.

> --b.
>
>>
>> Signed-off-by: Pavel Emelyanov <[email protected]>
>> ---
>> net/sunrpc/xprt.c | 2 --
>> 1 files changed, 0 insertions(+), 2 deletions(-)
>>
>> diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
>> index 953206d..64a4a94 100644
>> --- a/net/sunrpc/xprt.c
>> +++ b/net/sunrpc/xprt.c
>> @@ -199,8 +199,6 @@ int xprt_reserve_xprt(struct rpc_task *task)
>> if (test_and_set_bit(XPRT_LOCKED, &xprt->state)) {
>> if (task == xprt->snd_task)
>> return 1;
>> - if (task == NULL)
>> - return 0;
>> goto out_sleep;
>> }
>> xprt->snd_task = task;
>> --
>> 1.5.5.6
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> .
>

2010-10-05 22:46:35

by J. Bruce Fields

Subject: Re: [PATCH] sunrpc: Remove useless if (task == NULL) from xprt_reserve_xprt

On Tue, Oct 05, 2010 at 08:47:16PM +0400, Pavel Emelyanov wrote:
> The task in question is dereferenced above (and is actually never NULL).

Makes sense to me.

(But probably it should go through Trond unless there's some dependency
on your patches in my tree.)

--b.

>
> Signed-off-by: Pavel Emelyanov <[email protected]>
> ---
> net/sunrpc/xprt.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
> index 953206d..64a4a94 100644
> --- a/net/sunrpc/xprt.c
> +++ b/net/sunrpc/xprt.c
> @@ -199,8 +199,6 @@ int xprt_reserve_xprt(struct rpc_task *task)
> if (test_and_set_bit(XPRT_LOCKED, &xprt->state)) {
> if (task == xprt->snd_task)
> return 1;
> - if (task == NULL)
> - return 0;
> goto out_sleep;
> }
> xprt->snd_task = task;
> --
> 1.5.5.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html