Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4383064pxj; Tue, 25 May 2021 06:51:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbaLEKNAHy7MfRPgZr1xUt3AHCVNpiLpEQBvHAcPsj3l33BF6w8r1BhZu5/uBIIN7seHGR X-Received: by 2002:aa7:d2d4:: with SMTP id k20mr31196284edr.384.1621950712967; Tue, 25 May 2021 06:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621950712; cv=none; d=google.com; s=arc-20160816; b=zsDp4Kq3FNUH7AkMXObcHGe25ar0voaAV1avus349DRqtzeSmgmGQ7ZgjgimgiPzCe 0fxy+0LkaIK0XosUY2ztH3VqJDCTFGwN+D3KWjyUNCCMn+jR8FaNA+a9IMbwQgxNf1In vejaV9/z78WmfcjdbPEWplKdMUedvSO/eOBUQm0xIa4saZgN5h7uNy6L3+ehNkOMJ6KK Vt2cElWm1IVN/fPvAgHJHs9PfGgmNuqYTR3fNU2Sh8QOmEtRNgtQwk0FnND82ahbXQtv av4zFY8q3BXKPY4bk8WaOuUQwCKo0dQjPPkMbIsvV6wzr61zBwmDbQQO31kEmEG8z8sU qjFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=Xd8OifYoNQOCikHzR++3NeOR/xz1/yXNT7sn6d6yzXM=; b=ndzOPYbtT3skmQMDsFDCTLJ6b9lTg3avMkfIPTHlUeOMKPQvO4oaR7XrNqLQXRQOYU scPURFiyUdARWplNtloPD9L6yWzma2F5hRDUCye34Bz1+JdgAXjiqthvstOy7dBjUDbD U9eGHWpO+k77gWvlsWbjwFklz0ugrgM1jvzHkuIoVOWh2y+cyBnX91fEh/l5EwY0XIAY ToWtanCY3MiPbdxyAyx7mAP2JOxEeyjCMdI5hBnsKdJsNMluH6Jfaf826vzkGf/u5Cqi jxyxcl0N2q5kmFrkzLg9JSij2zl6xmXLHSF4dAxS19vQkQ/odelvSO9fGqQtiZJtQcU9 G2Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=nm1y6L5s; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v7si17648196edd.219.2021.05.25.06.51.29; Tue, 25 May 2021 06:51:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=nm1y6L5s; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233443AbhEYNwi (ORCPT + 99 others); Tue, 25 May 2021 09:52:38 -0400 Received: from mx2.suse.de ([195.135.220.15]:42556 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233200AbhEYNwe (ORCPT ); Tue, 25 May 2021 09:52:34 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1621950662; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xd8OifYoNQOCikHzR++3NeOR/xz1/yXNT7sn6d6yzXM=; b=nm1y6L5sx98fW3ya4ETm6cobwGk3mK4Rbvr0dd27LA7T6Klpj7rp6OLoBr98OmknmeMiA0 GAiNM/TDxIeAirMs1kSu3QJu7SyCutfA5NBEcTZlqMlsknj/z6w9qbeQI/5LTw0E0RhfAK WULOuyv2UNUeZrFDzAsQFxp6PyTHq7w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1621950662; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xd8OifYoNQOCikHzR++3NeOR/xz1/yXNT7sn6d6yzXM=; b=MpXHFE6Xqv1cFmXsCTjOpEiOcYOiUi3nvMA7eShKZt6qV/wNePjLY1ZrolXeIYcMYTldtS PF6XfrOYC1YffOCA== Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id B0E75AEB3; Tue, 25 May 2021 13:51:01 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 1FAB91F2CAF; Tue, 25 May 2021 15:51:00 +0200 (CEST) From: Jan Kara To: Cc: Christoph Hellwig , Dave Chinner , ceph-devel@vger.kernel.org, Chao Yu , Damien Le Moal , "Darrick J. Wong" , Jaegeuk Kim , Jeff Layton , Johannes Thumshirn , linux-cifs@vger.kernel.org, , linux-f2fs-devel@lists.sourceforge.net, , , Miklos Szeredi , Steve French , Ted Tso , Matthew Wilcox , Jan Kara Subject: [PATCH 04/13] mm: Add functions to lock invalidate_lock for two mappings Date: Tue, 25 May 2021 15:50:41 +0200 Message-Id: <20210525135100.11221-4-jack@suse.cz> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210525125652.20457-1-jack@suse.cz> References: <20210525125652.20457-1-jack@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Some operations such as reflinking blocks among files will need to lock invalidate_lock for two mappings. Add helper functions to do that. Signed-off-by: Jan Kara --- include/linux/fs.h | 6 ++++++ mm/filemap.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/include/linux/fs.h b/include/linux/fs.h index 897238d9f1e0..e6f7447505f5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -822,6 +822,12 @@ static inline void inode_lock_shared_nested(struct inode *inode, unsigned subcla void lock_two_nondirectories(struct inode *, struct inode*); void unlock_two_nondirectories(struct inode *, struct inode*); +void filemap_invalidate_down_write_two(struct address_space *mapping1, + struct address_space *mapping2); +void filemap_invalidate_up_write_two(struct address_space *mapping1, + struct address_space *mapping2); + + /* * NOTE: in a 32bit arch with a preemptable kernel and * an UP compile the i_size_read/write must be atomic diff --git a/mm/filemap.c b/mm/filemap.c index 4d9ec4c6cc34..d3801a9739aa 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1009,6 +1009,44 @@ struct page *__page_cache_alloc(gfp_t gfp) EXPORT_SYMBOL(__page_cache_alloc); #endif +/* + * filemap_invalidate_down_write_two - lock invalidate_lock for two mappings + * + * Lock exclusively invalidate_lock of any passed mapping that is not NULL. + * + * @mapping1: the first mapping to lock + * @mapping2: the second mapping to lock + */ +void filemap_invalidate_down_write_two(struct address_space *mapping1, + struct address_space *mapping2) +{ + if (mapping1 > mapping2) + swap(mapping1, mapping2); + if (mapping1) + down_write(&mapping1->invalidate_lock); + if (mapping2 && mapping1 != mapping2) + down_write_nested(&mapping2->invalidate_lock, 1); +} +EXPORT_SYMBOL(filemap_invalidate_down_write_two); + +/* + * filemap_invalidate_up_write_two - unlock invalidate_lock for two mappings + * + * Unlock exclusive invalidate_lock of any passed mapping that is not NULL. + * + * @mapping1: the first mapping to unlock + * @mapping2: the second mapping to unlock + */ +void filemap_invalidate_up_write_two(struct address_space *mapping1, + struct address_space *mapping2) +{ + if (mapping1) + up_write(&mapping1->invalidate_lock); + if (mapping2 && mapping1 != mapping2) + up_write(&mapping2->invalidate_lock); +} +EXPORT_SYMBOL(filemap_invalidate_up_write_two); + /* * In order to wait for pages to become available there must be * waitqueues associated with pages. By using a hash table of -- 2.26.2