From patchwork Tue Jan 5 18:30:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wilcox, Matthew R" X-Patchwork-Id: 7957751 Return-Path: X-Original-To: patchwork-linux-nvdimm@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 AED99BEEE5 for ; Tue, 5 Jan 2016 18:30:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD81820270 for ; Tue, 5 Jan 2016 18:30:18 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 54BE120265 for ; Tue, 5 Jan 2016 18:30:17 +0000 (UTC) Received: from ml01.vlan14.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 11CE61A2087; Tue, 5 Jan 2016 10:30:17 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ml01.01.org (Postfix) with ESMTP id B194C1A2057 for ; Tue, 5 Jan 2016 10:30:15 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 05 Jan 2016 10:30:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,525,1444719600"; d="scan'208";a="884314521" Received: from unknown (HELO thog.int.wil.cx) ([10.254.85.103]) by orsmga002.jf.intel.com with SMTP; 05 Jan 2016 10:30:15 -0800 Received: by thog.int.wil.cx (Postfix, from userid 1000) id 71E645F8D0; Tue, 5 Jan 2016 13:30:12 -0500 (EST) From: Matthew Wilcox To: Subject: [PATCH v2 8/8] ext4: Support for PUD-sized transparent huge pages Date: Tue, 5 Jan 2016 13:30:10 -0500 Message-Id: <1452018610-26090-9-git-send-email-matthew.r.wilcox@intel.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452018610-26090-1-git-send-email-matthew.r.wilcox@intel.com> References: <1452018610-26090-1-git-send-email-matthew.r.wilcox@intel.com> Cc: linux-nvdimm@lists.01.org, x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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: Matthew Wilcox ext4 needs to reserve enough space in the journal to allocate a PUD-sized page. Signed-off-by: Matthew Wilcox --- fs/ext4/file.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 6615499..7f850d5 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -211,6 +211,10 @@ static int ext4_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf) nblocks = ext4_chunk_trans_blocks(inode, PMD_SIZE / PAGE_SIZE); break; + case FAULT_FLAG_SIZE_PUD: + nblocks = ext4_chunk_trans_blocks(inode, + PUD_SIZE / PAGE_SIZE); + break; default: return VM_FAULT_FALLBACK; }