From patchwork Tue Jul 30 00:31:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murphy Zhou X-Patchwork-Id: 263158 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 214142C00D5 for ; Tue, 30 Jul 2013 10:32:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752719Ab3G3AcI (ORCPT ); Mon, 29 Jul 2013 20:32:08 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:59651 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752284Ab3G3AcH (ORCPT ); Mon, 29 Jul 2013 20:32:07 -0400 Received: by mail-pd0-f172.google.com with SMTP id z10so6036140pdj.31 for ; Mon, 29 Jul 2013 17:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:user-agent:mime-version :content-type; bh=0RKeTbTGmWHLp3bWHEM6lpDsYPe9VqODhE40KDtM9vQ=; b=YhwkB934C4SmZ+QWzK9JIuyJA09Qqf1xUIEioKdyowj7M6s5UbUbsEMruCi/Qdf13g W69P6xMvRVjC9RwaQYTp/r2yW5u/t6sjUO4iXnmn3tE7wHnM8ImfKBsbJlCanJMJNrcb EWI7oteLUiuPdRCShy0m0UEs+XqRXpCuWB+DFoDqTog8cvsB2Pc9afm3ESOOyvk0gkOS sZIvlw/7cNiboZ1qfuMQ5be4u8fErdcsflOjHCfZQ6H+0azIEXxlCM5lxZ0NCGeh7sf/ zsg9bdXfx7v6gntF9pjnFhd1N0/dZBZc9Lfuk/bh6fbjVxenYtYDvzu2NZHDeiagHjUt yZ7g== X-Received: by 10.66.144.199 with SMTP id so7mr70922770pab.99.1375144327146; Mon, 29 Jul 2013 17:32:07 -0700 (PDT) Received: from localhost ([123.127.250.67]) by mx.google.com with ESMTPSA id ys4sm79517770pbb.9.2013.07.29.17.31.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Jul 2013 17:32:06 -0700 (PDT) Date: Tue, 30 Jul 2013 08:31:46 +0800 (CST) From: Xiong Zhou To: Theodore Ts'o , Andrew Morton cc: Paul Gortmaker , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] include/jbd: add missing ifdef CONFIG_BLOCK Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Xiong Zhou In jbd{2}.h, BH_PrivateStart is used in the define of enum jbd_state_bits, which is defined in buffer_head.h under ifdef CONFIG_BLOCK. In these two headers, BUFFER_FNS and TAS_BUFFER_FNS and jbd_common.h refer to enum jbd_state_bits, so they should under ifdef CONFIG_BLOCK. Signed-off-by: Xiong Zhou --- include/linux/jbd.h | 2 ++ include/linux/jbd2.h | 2 ++ 2 files changed, 4 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 8685d1b..e9dcf47 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h @@ -244,6 +244,7 @@ typedef struct journal_superblock_s #include #include +#ifdef CONFIG_BLOCK enum jbd_state_bits { BH_JBD /* Has an attached ext3 journal_head */ = BH_PrivateStart, @@ -269,6 +270,7 @@ TAS_BUFFER_FNS(RevokeValid, revokevalid) BUFFER_FNS(Freed, freed) #include +#endif #define J_ASSERT(assert) BUG_ON(!(assert)) diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index d5b50a1..6214b80 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -298,6 +298,7 @@ typedef struct journal_superblock_s #include #include +#ifdef CONFIG_BLOCK enum jbd_state_bits { BH_JBD /* Has an attached ext3 journal_head */ = BH_PrivateStart, @@ -326,6 +327,7 @@ BUFFER_FNS(Shadow, shadow) BUFFER_FNS(Verified, verified) #include +#endif #define J_ASSERT(assert) BUG_ON(!(assert))