From patchwork Wed Nov 6 23:15:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 3149701 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0F0F39F3C4 for ; Wed, 6 Nov 2013 23:16:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25E3820303 for ; Wed, 6 Nov 2013 23:16:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4EEF6202FF for ; Wed, 6 Nov 2013 23:16:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752234Ab3KFXQe (ORCPT ); Wed, 6 Nov 2013 18:16:34 -0500 Received: from sandeen.net ([63.231.237.45]:56125 "EHLO sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929Ab3KFXP6 (ORCPT ); Wed, 6 Nov 2013 18:15:58 -0500 Received: by sandeen.net (Postfix, from userid 500) id 7EE82654E647; Wed, 6 Nov 2013 17:15:57 -0600 (CST) From: Eric Sandeen To: linux-btrfs@vger.kernel.org Subject: [PATCH 09/16] btrfs-progs: btrfs_scan_kernel(): fd==0 is not an error Date: Wed, 6 Nov 2013 17:15:48 -0600 Message-Id: <1383779755-18228-10-git-send-email-sandeen@redhat.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1383779755-18228-1-git-send-email-sandeen@redhat.com> References: <1383779755-18228-1-git-send-email-sandeen@redhat.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The error return from open is -1, so test that, not 0, for success/failure. Resolves-Coverity-CID: 1125931 Signed-off-by: Eric Sandeen Reviewed-by: Anand Jain --- cmds-filesystem.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmds-filesystem.c b/cmds-filesystem.c index e6642ef..df9d1ff 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -362,13 +362,13 @@ static int btrfs_scan_kernel(void *search) } fd = open(mnt->mnt_dir, O_RDONLY); - if (fd > 0 && !get_df(fd, &space_info_arg)) { + if ((fd != -1) && !get_df(fd, &space_info_arg)) { get_label_mounted(mnt->mnt_dir, label); print_one_fs(&fs_info_arg, dev_info_arg, space_info_arg, label, mnt->mnt_dir); free(space_info_arg); } - if (fd > 0) + if (fd != -1) close(fd); free(dev_info_arg); }