]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
NFS: fix the return value check by using IS_ERR
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Fri, 21 Sep 2012 04:27:41 +0000 (12:27 +0800)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 25 Sep 2012 14:36:37 +0000 (10:36 -0400)
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>
fs/nfs/nfs4namespace.c
fs/nfs/nfs4proc.c

index 017b4b01a69c7a747b4afab8c7591b5f2ac59a20..398d5fd741575db80757a00244fa307728c6c3ee 100644 (file)
@@ -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);
        }
index 1e50326d00ddd1f7ef8931470bc1cd0ad32b4015..ddfebb128017a5f89740dcbb8a85f4f6d3a50bc8 100644 (file)
@@ -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;
        }