Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8d920c5 authored by Wei Yongjun's avatar Wei Yongjun Committed by Trond Myklebust
Browse files

NFS: fix the return value check by using IS_ERR 

In case of error, the function rpcauth_create() returns ERR_PTR()
and never returns NULL pointer. The NULL test in the return value
check should be replaced with IS_ERR().

dpatch engine is used to auto generated this patch.
(https://github.com/weiyj/dpatch

)

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 84e28a30

fs/nfs/nfs4namespace.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ struct rpc_clnt *nfs4_create_sec_client(struct rpc_clnt *clnt, struct inode *ino 
		return clone;



	auth = rpcauth_create(flavor, clone);

	if (!auth) {

	if (IS_ERR(auth)) {

		rpc_shutdown_client(clone);

		clone = ERR_PTR(-EIO);

	}

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -2399,7 +2399,7 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl 
	int ret;



	auth = rpcauth_create(flavor, server->client);

	if (!auth) {

	if (IS_ERR(auth)) {

		ret = -EIO;

		goto out;

	}