Skip to content

Commit

Permalink
NFS: fix the return value check by using IS_ERR
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wei Yongjun authored and Trond Myklebust committed Sep 25, 2012
1 parent 84e28a3 commit e8d920c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion fs/nfs/nfs4namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/nfs4proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit e8d920c

Please sign in to comment.