From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753299AbbJFW3K (ORCPT ); Tue, 6 Oct 2015 18:29:10 -0400 Received: from mga02.intel.com ([134.134.136.20]:15970 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752760AbbJFW3I (ORCPT ); Tue, 6 Oct 2015 18:29:08 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,646,1437462000"; d="scan'208";a="805120768" From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , Alexander Viro , Matthew Wilcox , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , Dan Williams , Dave Chinner , Jan Kara , "Kirill A. Shutemov" , linux-nvdimm@ml01.01.org, Matthew Wilcox Subject: [PATCH v4 0/2] Revert locking changes in DAX for v4.3 Date: Tue, 6 Oct 2015 16:28:47 -0600 Message-Id: <1444170529-12814-1-git-send-email-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This series reverts some recent changes to the locking scheme in DAX introduced by these two commits: commit 843172978bb9 ("dax: fix race between simultaneous faults") commit 46c043ede471 ("mm: take i_mmap_lock in unmap_mapping_range() for DAX") Changes from v3: - reduced the revert of 46c043ede471 in patch 1 so that we still drop the mapping->i_mmap_rwsem before calling unmap_mapping_range(). This prevents the deadlock in the __dax_pmd_fault() path so there is no longer a need to temporarily disable DAX PMD faults. Ross Zwisler (2): Revert "mm: take i_mmap_lock in unmap_mapping_range() for DAX" Revert "dax: fix race between simultaneous faults" fs/dax.c | 70 +++++++++++++++++++++++++------------------------------------ mm/memory.c | 2 ++ 2 files changed, 31 insertions(+), 41 deletions(-) -- 2.1.0