aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-21 00:27:41 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-09-25 10:36:37 -0400
commite8d920c58ddb45126e1b306854f6e34b88446baf (patch)
tree9022863bcb9fa0ee7218f1d1f878846e222ab41e
parent84e28a307e376f271505af65a7b7e212dd6f61f4 (diff)
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: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4namespace.c2
-rw-r--r--fs/nfs/nfs4proc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index 017b4b01a69c..398d5fd74157 100644
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -205,7 +205,7 @@ struct rpc_clnt *nfs4_create_sec_client(struct rpc_clnt *clnt, struct inode *ino
205 return clone; 205 return clone;
206 206
207 auth = rpcauth_create(flavor, clone); 207 auth = rpcauth_create(flavor, clone);
208 if (!auth) { 208 if (IS_ERR(auth)) {
209 rpc_shutdown_client(clone); 209 rpc_shutdown_client(clone);
210 clone = ERR_PTR(-EIO); 210 clone = ERR_PTR(-EIO);
211 } 211 }
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 1e50326d00dd..ddfebb128017 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2399,7 +2399,7 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl
2399 int ret; 2399 int ret;
2400 2400
2401 auth = rpcauth_create(flavor, server->client); 2401 auth = rpcauth_create(flavor, server->client);
2402 if (!auth) { 2402 if (IS_ERR(auth)) {
2403 ret = -EIO; 2403 ret = -EIO;
2404 goto out; 2404 goto out;
2405 } 2405 }