From patchwork Tue Jan 13 22:20:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 5624581 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 78F5BC058D for ; Tue, 13 Jan 2015 22:22:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A764820259 for ; Tue, 13 Jan 2015 22:22:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A61BA20253 for ; Tue, 13 Jan 2015 22:22:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752847AbbAMWV5 (ORCPT ); Tue, 13 Jan 2015 17:21:57 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:28742 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751122AbbAMWV4 (ORCPT ); Tue, 13 Jan 2015 17:21:56 -0500 Received: from pps.filterd (m0044012 [127.0.0.1]) by mx0a-00082601.pphosted.com (8.14.5/8.14.5) with SMTP id t0DMLmoH011917 for ; Tue, 13 Jan 2015 14:21:56 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : mime-version : content-type; s=facebook; bh=RBGitlvXUVlx7nwxYHT9FP7dKNZ5eC6kEHp6GWJtcbw=; b=S2M4sFRyFqTFotcnO6cJ98mzj0Pkdpq2qHHFKTwnEXp248La1lDwVJOtgfo29Cbdeonv ug+P2bmUzzzpLdgJng9HfLhzKPxsB3zAvM15Hc8PPSb+463sfmpotVXZjE1nbNwx5oNo XO870fQxYh3LQB5gkyMyo7T5LPNSZepVAV4= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 1rwbqrg222-6 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=OK) for ; Tue, 13 Jan 2015 14:21:56 -0800 Received: from localhost (192.168.57.29) by mail.thefacebook.com (192.168.16.24) with Microsoft SMTP Server (TLS) id 14.3.195.1; Tue, 13 Jan 2015 14:20:20 -0800 From: Josef Bacik To: Subject: [PATCH] Revert "btrfs-progs: disable backtrace and define __always_inline" Date: Tue, 13 Jan 2015 17:20:19 -0500 Message-ID: <1421187619-24936-1-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [192.168.57.29] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68, 1.0.33, 0.0.0000 definitions=2015-01-13_07:2015-01-13, 2015-01-13, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=6.32827124036339e-15 kscore.compositescore=0 circleOfTrustscore=514.84 compositescore=0.996321851895651 urlsuspect_oldscore=0.996321851895651 suspectscore=1 recipient_domain_to_sender_totalscore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=64355 rbsscore=0.996321851895651 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.9 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1501130220 X-FB-Internal: deliver 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,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 This reverts commit c2691f807ddd2c6b261c5707f6838a45d9275390 as it breaks backtracing on actual glibc environments. Signed-off-by: Josef Bacik --- kerncompat.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/kerncompat.h b/kerncompat.h index 7397274..5c1cca9 100644 --- a/kerncompat.h +++ b/kerncompat.h @@ -29,12 +29,6 @@ #include #include #include - -#ifndef __glibc__ -#define BTRFS_DISABLE_BACKTRACE -#define __always_inline __inline __attribute__ ((__always_inline__)) -#endif - #ifndef BTRFS_DISABLE_BACKTRACE #include #endif