From patchwork Wed Sep 4 15:22:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2853748 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 3DFFC9F485 for ; Wed, 4 Sep 2013 15:23:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 867F9204CE for ; Wed, 4 Sep 2013 15:23:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F081201ED for ; Wed, 4 Sep 2013 15:23:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762880Ab3IDPW6 (ORCPT ); Wed, 4 Sep 2013 11:22:58 -0400 Received: from mail-pb0-f49.google.com ([209.85.160.49]:62449 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756525Ab3IDPW5 (ORCPT ); Wed, 4 Sep 2013 11:22:57 -0400 Received: by mail-pb0-f49.google.com with SMTP id xb4so431435pbc.8 for ; Wed, 04 Sep 2013 08:22:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fu7OV0/mzq5t+hiIq7w3m5xV52256PHsc60TvyvRtV0=; b=y4h7txdlSacBC8D2LuHMPvL4lvN72rTpCurCWw1F2WGtOUZovAI3gncrQxZQjhbHVo u6ZJN5zZvyDgZieIYBriCxh21XDL8H/C5QywHQvGvUzwkIp8rig94zKqzIZIE9Y8wSoO 8B+VvVCgDXUufwMkZka03qRDKiYvLOc1/Sz039aNYRs+3ukr8QKfMyWpIhYPbpUcyh+H OC833NELXvDlu2UNvJ0NJGP54WAbsWSCQyrf0bBlbypZ4fxTQmsiwAP0n/L4lTQTH052 HgKIkKXRKVLZWDjtLiwkLH2ME8xkx5z5nnu+M0Uja7NMYseNkGx9A7mm9YqKXCfV/d2j VVJw== X-Received: by 10.66.150.232 with SMTP id ul8mr4001795pab.26.1378308176740; Wed, 04 Sep 2013 08:22:56 -0700 (PDT) Received: from localhost.localdomain.localdomain ([223.65.191.73]) by mx.google.com with ESMTPSA id uw6sm29467271pbc.8.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 04 Sep 2013 08:22:56 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, sandeen@redhat.com Subject: [PATCH 05/20] Btrfs-progs: fix magic return value in cmds-device.c Date: Wed, 4 Sep 2013 23:22:22 +0800 Message-Id: <1378308157-4621-6-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1378308157-4621-1-git-send-email-wangshilong1991@gmail.com> References: <1378308157-4621-1-git-send-email-wangshilong1991@gmail.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=-9.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Wang Shilong Signed-off-by: Wang Shilong --- cmds-device.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/cmds-device.c b/cmds-device.c index 7524d08..800a050 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -55,7 +55,7 @@ static int cmd_add_dev(int argc, char **argv) fdmnt = open_file_or_dir(mntpnt, &dirstream); if (fdmnt < 0) { fprintf(stderr, "ERROR: can't access to '%s'\n", mntpnt); - return 12; + return 1; } for (i = 1; i < argc - 1; i++ ){ @@ -120,10 +120,7 @@ static int cmd_add_dev(int argc, char **argv) } close_file_or_dir(fdmnt, dirstream); - if (ret) - return ret+20; - else - return 0; + return !!ret; } static const char * const cmd_rm_dev_usage[] = { @@ -146,7 +143,7 @@ static int cmd_rm_dev(int argc, char **argv) fdmnt = open_file_or_dir(mntpnt, &dirstream); if (fdmnt < 0) { fprintf(stderr, "ERROR: can't access to '%s'\n", mntpnt); - return 12; + return 1; } for(i=1 ; i < argc - 1; i++ ){ @@ -170,10 +167,7 @@ static int cmd_rm_dev(int argc, char **argv) } close_file_or_dir(fdmnt, dirstream); - if( ret) - return ret+20; - else - return 0; + return !!ret; } static const char * const cmd_scan_dev_usage[] = { @@ -202,7 +196,7 @@ static int cmd_scan_dev(int argc, char **argv) ret = scan_for_btrfs(where, 1); if (ret){ fprintf(stderr, "ERROR: error %d while scanning\n", ret); - return 18; + return 1; } return 0; } @@ -210,7 +204,7 @@ static int cmd_scan_dev(int argc, char **argv) fd = open("/dev/btrfs-control", O_RDWR); if (fd < 0) { perror("failed to open /dev/btrfs-control"); - return 10; + return 1; } for( i = devstart ; i < argc ; i++ ){ @@ -232,7 +226,7 @@ static int cmd_scan_dev(int argc, char **argv) close(fd); fprintf(stderr, "ERROR: unable to scan the device '%s' - %s\n", argv[i], strerror(e)); - return 11; + return 1; } } @@ -258,7 +252,7 @@ static int cmd_ready_dev(int argc, char **argv) fd = open("/dev/btrfs-control", O_RDWR); if (fd < 0) { perror("failed to open /dev/btrfs-control"); - return 10; + return 1; } strncpy(args.name, argv[argc - 1], BTRFS_PATH_NAME_MAX); @@ -320,7 +314,7 @@ static int cmd_dev_stats(int argc, char **argv) if (fdmnt < 0) { fprintf(stderr, "ERROR: can't access '%s'\n", dev_path); - return 12; + return 1; } ret = get_fs_info(dev_path, &fi_args, &di_args);