From patchwork Wed Jun 26 04:14:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: root X-Patchwork-Id: 2782631 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 C2B639F968 for ; Wed, 26 Jun 2013 04:14:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD7FC20171 for ; Wed, 26 Jun 2013 04:14:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A9D52013B for ; Wed, 26 Jun 2013 04:14:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751276Ab3FZEOs (ORCPT ); Wed, 26 Jun 2013 00:14:48 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:49982 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826Ab3FZEOr (ORCPT ); Wed, 26 Jun 2013 00:14:47 -0400 Received: by mail-pa0-f44.google.com with SMTP id lj1so13647249pab.17 for ; Tue, 25 Jun 2013 21:14:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cristianrodriguez.net; s=google; h=sender:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=cVyIQI8x3iVlp8vkcch7sS34OGDKHh/gbigAKpgUxIM=; b=GVanp5J76sbq5qp/EVI2PfcLi2tc0wY7iIBIwsjC3CKIGosL2V8JQCWQDQn5biGFbw +schLF3ODKFDVebbNW2rFGD7/3q1gkAKNgkIsBjG/NNXdGTJm9hi/LEi29GwMtZQcK0l gM5gVwiUAz9RXdgfSmmfeGL1DE9XrIaMo7Sqk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=cVyIQI8x3iVlp8vkcch7sS34OGDKHh/gbigAKpgUxIM=; b=cet4pv/+Bb3waDT7eHE2eaOXsg/aTwftPuuGXvQxfu8K3CWX77vSkXSfZoj4jYrz3H SLT3OjcLbfAFrq1sri8Rusquhw7ReQDkWZtbsjcEdpEl/PhEcwwdGKAqQqu0wDR6oQ87 jp3E8e1BtgTL5liFzs5lGILVNU9HqRCyFvi2PC+RLZzKD8A36dAdxSoo9jYhxc2BZP7v gZJgJWvnMK2lriEB53hCVccmooFQIWgEpnReheiOwNTUQn9/rde52zQnr/vKbcIjsRMR 51Dm5DahCG5/k8ANYr14ODHLzBF1CK98I1eWx9CDJgG8YD4TQeji3Oy5kvao0irK4Lkp BrPA== X-Received: by 10.66.252.129 with SMTP id zs1mr2820492pac.113.1372220087252; Tue, 25 Jun 2013 21:14:47 -0700 (PDT) Received: from localhost (pc-114-47-101-190.cm.vtr.net. [190.101.47.114]) by mx.google.com with ESMTPSA id fn9sm28406963pab.2.2013.06.25.21.14.44 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Jun 2013 21:14:46 -0700 (PDT) From: root To: linux-btrfs@vger.kernel.org Cc: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Subject: [PATCH btrfs-progs] kerncompat.h: remove offsetof redefinition Date: Wed, 26 Jun 2013 00:14:39 -0400 Message-Id: <1372220079-17236-1-git-send-email-root@xps9000.cristianrodriguez.net> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnm4bF6t3AsSalc0q08D1mkjdVmcDJEER/QslLgFPdSYiCBOYY696CNwGurq8SbtDVbNbgt Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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: Cristian Rodríguez Must use the version provided by the compiler in stddef.h header --- kerncompat.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kerncompat.h b/kerncompat.h index 9c116b4..6b4b4ba 100644 --- a/kerncompat.h +++ b/kerncompat.h @@ -26,6 +26,7 @@ #include #include #include +#include #ifndef READ #define READ 0 @@ -234,12 +235,6 @@ static inline long IS_ERR(const void *ptr) #define BUG_ON(c) assert(!(c)) #define WARN_ON(c) assert(!(c)) -#undef offsetof -#ifdef __compiler_offsetof -#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER) -#else -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif #define container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \