From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758881AbbJHV6H (ORCPT ); Thu, 8 Oct 2015 17:58:07 -0400 Received: from mga01.intel.com ([192.55.52.88]:3008 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757227AbbJHV6G (ORCPT ); Thu, 8 Oct 2015 17:58:06 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,656,1437462000"; d="scan'208";a="822520518" From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , Dave Chinner , xfs@oss.sgi.com Subject: [PATCH] xfs: clarify lock ordering comment Date: Thu, 8 Oct 2015 15:58:01 -0600 Message-Id: <1444341481-14139-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 Replace "i_mmap_lock" with "mmap_lock" in the lock ordering comment above xfs_filemap_page_mkwrite(). The lock in question is actually the XFS_MMAPLOCK_SHARED rw_semaphore (no leading "i"), and this comment is easily confused with the "i_mmap_lock_[read|write]" functions that operate on struct address_space->i_mmap_rwsem. This clarification is especially important because address_space->i_mmap_rwsem is taken down in the DAX code as part of this fault path. Signed-off-by: Ross Zwisler --- fs/xfs/xfs_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index f429662..b190033 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -1477,7 +1477,7 @@ xfs_file_llseek( * * mmap_sem (MM) * sb_start_pagefault(vfs, freeze) - * i_mmap_lock (XFS - truncate serialisation) + * mmap_lock (XFS - truncate serialisation) * page_lock (MM) * i_lock (XFS - extent map serialisation) */ -- 2.1.0