From patchwork Wed Sep 2 12:22:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhaolei X-Patchwork-Id: 7111621 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 16C18BEEC1 for ; Wed, 2 Sep 2015 12:24:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 509C82065A for ; Wed, 2 Sep 2015 12:24:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C17A20656 for ; Wed, 2 Sep 2015 12:24:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754276AbbIBMYR (ORCPT ); Wed, 2 Sep 2015 08:24:17 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:25821 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754062AbbIBMYP (ORCPT ); Wed, 2 Sep 2015 08:24:15 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="100283461" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 02 Sep 2015 20:27:13 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t82CO0VF030322 for ; Wed, 2 Sep 2015 20:24:00 +0800 Received: from localhost.localdomain (10.167.226.114) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server id 14.3.181.6; Wed, 2 Sep 2015 20:24:09 +0800 From: Zhao Lei To: CC: Zhao Lei Subject: [PATCH v3 2/4] btrfs-progs: Use long type to get thread's return value Date: Wed, 2 Sep 2015 20:22:30 +0800 Message-ID: <150254cca3ab0c7a5e064ed5e90aa9416100c949.1441196519.git.zhaolei@cn.fujitsu.com> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: References: MIME-Version: 1.0 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, T_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 pthread use void * to save return status, we can use this pointer to save our return value, but we need keep the same length. This patch move to use long type variable to save return value of our thread, to avoid potentia invalid memory access. Signed-off-by: Zhao Lei --- chunk-recover.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chunk-recover.c b/chunk-recover.c index 66a4ce6..3cb22ae 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -829,7 +829,7 @@ static int scan_devices(struct recover_control *rc) struct btrfs_device *dev; struct device_scan *dev_scans; pthread_t *t_scans; - int *t_rets; + long *t_rets; int devnr = 0; int devidx = 0; int cancel_from = 0; @@ -845,7 +845,7 @@ static int scan_devices(struct recover_control *rc) t_scans = (pthread_t *)malloc(sizeof(pthread_t) * devnr); if (!t_scans) return -ENOMEM; - t_rets = (int *)malloc(sizeof(int) * devnr); + t_rets = (long *)malloc(sizeof(long) * devnr); if (!t_rets) return -ENOMEM;