nfsd: tidy return values in nfs4_delegation_exists()
diff mbox

Message ID 20180323113705.GB28518@mwanda
State New
Headers show

Commit Message

Dan Carpenter March 23, 2018, 11:37 a.m. UTC
We made nfs4_delegation_exists() return a bool in 68b18f52947b ("nfsd:
make nfs4_get_existing_delegation less confusing"), but it's still
returning -EINVAL.  That's fine, because it -EINVAL becomes true which
is what we want, but it's not very tidy.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

J. Bruce Fields March 23, 2018, 6:50 p.m. UTC | #1
On Fri, Mar 23, 2018 at 02:37:05PM +0300, Dan Carpenter wrote:
> We made nfs4_delegation_exists() return a bool in 68b18f52947b ("nfsd:
> make nfs4_get_existing_delegation less confusing"), but it's still
> returning -EINVAL.  That's fine, because it -EINVAL becomes true which
> is what we want, but it's not very tidy.

Oops, I fixed this a couple days ago when Fengguang Wu complained about
the 0/false thing, but forgot to push it out.  Added a Reported-by: for
you and pushed it out now to

	git://linux-nfs.org/~bfields/linux.git nfsd-next

--b.

> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index a64ee08aadb2..f0b5af3ca8f7 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -935,10 +935,10 @@ nfs4_delegation_exists(struct nfs4_client *clp, struct nfs4_file *fp)
>  	list_for_each_entry(searchdp, &fp->fi_delegations, dl_perfile) {
>  		searchclp = searchdp->dl_stid.sc_client;
>  		if (clp == searchclp) {
> -			return -EAGAIN;
> +			return true;
>  		}
>  	}
> -	return 0;
> +	return false;
>  }
>  
>  /**
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a64ee08aadb2..f0b5af3ca8f7 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -935,10 +935,10 @@  nfs4_delegation_exists(struct nfs4_client *clp, struct nfs4_file *fp)
 	list_for_each_entry(searchdp, &fp->fi_delegations, dl_perfile) {
 		searchclp = searchdp->dl_stid.sc_client;
 		if (clp == searchclp) {
-			return -EAGAIN;
+			return true;
 		}
 	}
-	return 0;
+	return false;
 }
 
 /**