From patchwork Sat Jun 20 07:16:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 11615805 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 469FE60D for ; Sat, 20 Jun 2020 07:17:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F4D92399C for ; Sat, 20 Jun 2020 07:17:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="r9OPc4mV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727814AbgFTHR1 (ORCPT ); Sat, 20 Jun 2020 03:17:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727097AbgFTHRM (ORCPT ); Sat, 20 Jun 2020 03:17:12 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2191FC06174E; Sat, 20 Jun 2020 00:17:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=zelkr+SM8XFpWH/uxQ7pO/ZVcwZFMxEHAVg6KgUuZNw=; b=r9OPc4mVqFx6CMkHuQU2rk0CNs aphyOheC3GNpDpzI352XMI/xrGUzNL3EgXHHrCowKKJjgASAD5ysQPs9NnsXchvkTatOkuW+UeSGV /FG34j6ovPyQUerIQxm8dALSfd4evm3rRYfZByEi0kH7ZnIz3Vi06cdCqrAiAqWe0LhvWSjiNAwDG xCyke98Sl0/qEXd4D7gyKzggxc/JEfPHlnE2CRQXEd24z+TpdOm3+iBdzMxuLwrnNVb+o6j1qq/Rc unc7fpS5sgScoSEt1aDht54L+0LXu9CTsTJLw9NYVkATh/U2YNzHvYE8kHvL757Crt5r5FOxFDitu /IE40kXA==; Received: from 195-192-102-148.dyn.cablelink.at ([195.192.102.148] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jmXkT-0003tj-Uw; Sat, 20 Jun 2020 07:17:10 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Al Viro , Greg Kroah-Hartman , Jiri Slaby , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] fs: move the buffer_heads_over_limit stub to buffer_head.h Date: Sat, 20 Jun 2020 09:16:42 +0200 Message-Id: <20200620071644.463185-9-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200620071644.463185-1-hch@lst.de> References: <20200620071644.463185-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Move the !CONFIG_BLOCK stub to the same place as the non-stub declaration. Signed-off-by: Christoph Hellwig Reviewed-by: Bart Van Assche Reviewed-by: Johannes Thumshirn --- include/linux/blkdev.h | 1 - include/linux/buffer_head.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 50fccb121b876e..973253ce202d87 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1840,7 +1840,6 @@ struct block_device; /* * stubs for when the block layer is configured out */ -#define buffer_heads_over_limit 0 static inline long nr_blockdev_pages(void) { diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 22fb11e2d2e04d..6b47f94378c5ad 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -406,6 +406,7 @@ static inline int inode_has_buffers(struct inode *inode) { return 0; } static inline void invalidate_inode_buffers(struct inode *inode) {} static inline int remove_inode_buffers(struct inode *inode) { return 1; } static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; } +#define buffer_heads_over_limit 0 #endif /* CONFIG_BLOCK */ #endif /* _LINUX_BUFFER_HEAD_H */