From patchwork Fri Sep 21 04:27:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1489231 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D7ABE3FCFC for ; Fri, 21 Sep 2012 04:27:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751472Ab2IUE1v (ORCPT ); Fri, 21 Sep 2012 00:27:51 -0400 Received: from mail-qa0-f53.google.com ([209.85.216.53]:50146 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751369Ab2IUE1m (ORCPT ); Fri, 21 Sep 2012 00:27:42 -0400 Received: by qaas11 with SMTP id s11so971335qaa.19 for ; Thu, 20 Sep 2012 21:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=ZDdAfYcDqOPPSZmQ+EcQAOrIlKUFHUnvAOhO2GvKhVM=; b=sMLbqzQU5aAfAQVz1hx83Y8DivT4SPNbvHQ0Vfuj+utEJHFmpA0/bi8FJ2htWI1A6t 6jUc4kRK+NmKk8lcq4KTk6aO5Y7wHugMNWFv/fAb2P/zZQE9LNcTOL9ljBXbZ35hlErr wd1SVNbNGe4IhyvdVIOIhqBz+h11rNY1ExzTRd4tnaKRaMMVNuIkqUxnmhPVCvGHY0HQ IeWYsgU23Yxi4/1kRj58qJgdxSQT11tNF0jaXEmyMZDoXUNqwGVKBoI3ArnQGzdtl1CS xCwAMyq9vwWIg+Tg/upb3CVUio7POTZIic9xW8wKzuexLn/FlUUDsqAmFGwwLITEchuI dRcA== MIME-Version: 1.0 Received: by 10.229.136.131 with SMTP id r3mr2590349qct.145.1348201661573; Thu, 20 Sep 2012 21:27:41 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Thu, 20 Sep 2012 21:27:41 -0700 (PDT) Date: Fri, 21 Sep 2012 12:27:41 +0800 Message-ID: Subject: [PATCH] NFS: fix the return value check by using IS_ERR From: Wei Yongjun To: Trond.Myklebust@netapp.com Cc: yongjun_wei@trendmicro.com.cn, linux-nfs@vger.kernel.org Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Wei Yongjun 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 --- fs/nfs/nfs4proc.c | 2 +- fs/nfs/nfs4namespace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 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 diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1e50326..ddfebb1 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 int ret; auth = rpcauth_create(flavor, server->client); - if (!auth) { + if (IS_ERR(auth)) { ret = -EIO; goto out; } diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c index 017b4b0..398d5fd 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 return clone; auth = rpcauth_create(flavor, clone); - if (!auth) { + if (IS_ERR(auth)) { rpc_shutdown_client(clone); clone = ERR_PTR(-EIO); }