From patchwork Fri Sep 21 04:42:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1489241 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 677E9DF28C for ; Fri, 21 Sep 2012 04:42:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751803Ab2IUEmF (ORCPT ); Fri, 21 Sep 2012 00:42:05 -0400 Received: from mail-qa0-f53.google.com ([209.85.216.53]:36392 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750850Ab2IUEmC (ORCPT ); Fri, 21 Sep 2012 00:42:02 -0400 Received: by qaas11 with SMTP id s11so976327qaa.19 for ; Thu, 20 Sep 2012 21:42:02 -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=LU0MxHFuLrFtjOMyi0dwOswEXCqrC+a8NTRN8x0mDVo=; b=kkyZc9n2eifn/MibyeeNjGPPGpYWWA5QJxqgS8k/x/ea8aJ5TUp41FMvPUPTlGNzST p1bahO9xZLFzby5718F5TQCLdWTtLYm27ooBoW0pD99bPuSish8WAlA8+Zvkrj0aKXjD VaXDIvjZKIz8iGo0NDnrrh62BRVBFAYKs3xPnYaE/6trX55y6GAwJ+O/yHnzVeGbIJK/ TAKtJcpZupECwj7fjT1+/IUH0DVa/8/EvJbs+bnVi+xei48RkmtNUkMJnYNYW6LHgCZP 8x76BgSzmOTwTRlJvmNsQgaICi+PVB4WdvjpVKvBjyU7kaRHFcysJZhnq1rP38LYm85V JNrA== MIME-Version: 1.0 Received: by 10.229.136.200 with SMTP id s8mr2634550qct.46.1348202522274; Thu, 20 Sep 2012 21:42:02 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Thu, 20 Sep 2012 21:42:02 -0700 (PDT) Date: Fri, 21 Sep 2012 12:42:02 +0800 Message-ID: Subject: [PATCH] Btrfs: fix return value check in btrfs_ioctl_send() From: Wei Yongjun To: chris.mason@fusionio.com Cc: yongjun_wei@trendmicro.com.cn, linux-btrfs@vger.kernel.org Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Wei Yongjun In case of error, the function btrfs_read_fs_root_no_name() returns ERR_PTR() and never returns NULL pointer. The NULL test in the return value check should be replaced with IS_ERR(), and remove useless NULL test. dpatch engine is used to auto generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun --- fs/btrfs/send.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" 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/btrfs/send.c b/fs/btrfs/send.c index fb5ffe9..a617451 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -4501,10 +4501,6 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; clone_root = btrfs_read_fs_root_no_name(fs_info, &key); - if (!clone_root) { - ret = -EINVAL; - goto out; - } if (IS_ERR(clone_root)) { ret = PTR_ERR(clone_root); goto out; @@ -4520,8 +4516,8 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; sctx->parent_root = btrfs_read_fs_root_no_name(fs_info, &key); - if (!sctx->parent_root) { - ret = -EINVAL; + if (IS_ERR(sctx->parent_root)) { + ret = PTR_ERR(sctx->parent_root); goto out; } }