From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82A73C71136 for ; Tue, 17 Jun 2025 10:14:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E13E6B009F; Tue, 17 Jun 2025 06:14:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B9636B00A1; Tue, 17 Jun 2025 06:14:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E73AA6B00A6; Tue, 17 Jun 2025 06:14:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id CF7426B009F for ; Tue, 17 Jun 2025 06:14:04 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 706421A1BDA for ; Tue, 17 Jun 2025 10:14:04 +0000 (UTC) X-FDA: 83564482008.01.002C169 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf22.hostedemail.com (Postfix) with ESMTP id 2E9CDC000D for ; Tue, 17 Jun 2025 10:14:01 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=GCA4vRTt; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=vofk+nlP; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=GCA4vRTt; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=vofk+nlP; dmarc=none; spf=pass (imf22.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750155242; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HumSZqJEc3NqTuF1gCNLL1DjTVit469VH90oXWtD97g=; b=AoyKMPcMJxixuhBINya0iiaufLa1L0vJI/OBwJKotLQOEtz6hLzzU7zOrhEt89DMmx8U6D emTTsfuFlABezd/EbVClj0TvvsKEPvdxDrfqW9Q22X3cOJxcm22r+LiCIBhFw3+rrX06pm AwCuz8VZb9JYPh4SYkSmkDgaYy0iYoc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750155242; a=rsa-sha256; cv=none; b=2VzXzyPNGIJbg+dZBo2lT8ktUOeybvbf0ydgZ7vcMz6EYToeoj+2acl+YY/6zCvfBbeA6e VeXeAE35ku6+uom6FT4saNaktjBmiApHDA/N+/IGrjTz270PXvP2eVwuiDbkRRPVd63U2c pHgavY82+vKrdXsOLA6SKcySw6w3hFY= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=GCA4vRTt; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=vofk+nlP; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=GCA4vRTt; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=vofk+nlP; dmarc=none; spf=pass (imf22.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A44E7211CB; Tue, 17 Jun 2025 10:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1750155240; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HumSZqJEc3NqTuF1gCNLL1DjTVit469VH90oXWtD97g=; b=GCA4vRTtep8lSNqForgDoEbiH2FHffylKbTQW8ADGX0ygw7y0YzgmvKyJudwz1c+pn/vrP oiM1utFqq3DKasuCS+rvGIM3fht87NThulP97W1MoOrovEYbQlceN3dPfOwqPwPdTl/wzO Jc9QPnSqRm9TOoCgWTtotAyb95FVifI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1750155240; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HumSZqJEc3NqTuF1gCNLL1DjTVit469VH90oXWtD97g=; b=vofk+nlPab1BttxugZRXW6jQtLNByPTK8FyDt52WanP8wxnuDGkGdmSvEDafeB/gXZrhW8 SgAfoWxD1JFY7mAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1750155240; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HumSZqJEc3NqTuF1gCNLL1DjTVit469VH90oXWtD97g=; b=GCA4vRTtep8lSNqForgDoEbiH2FHffylKbTQW8ADGX0ygw7y0YzgmvKyJudwz1c+pn/vrP oiM1utFqq3DKasuCS+rvGIM3fht87NThulP97W1MoOrovEYbQlceN3dPfOwqPwPdTl/wzO Jc9QPnSqRm9TOoCgWTtotAyb95FVifI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1750155240; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HumSZqJEc3NqTuF1gCNLL1DjTVit469VH90oXWtD97g=; b=vofk+nlPab1BttxugZRXW6jQtLNByPTK8FyDt52WanP8wxnuDGkGdmSvEDafeB/gXZrhW8 SgAfoWxD1JFY7mAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 848BB13AE2; Tue, 17 Jun 2025 10:14:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 3XpZIOg/UWhcGQAAD6G6ig (envelope-from ); Tue, 17 Jun 2025 10:14:00 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 33D4AA29F0; Tue, 17 Jun 2025 12:14:00 +0200 (CEST) Date: Tue, 17 Jun 2025 12:14:00 +0200 From: Jan Kara To: Lorenzo Stoakes Cc: Andrew Morton , "Liam R . Howlett" , Jens Axboe , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Simona Vetter , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Sterba , David Howells , Marc Dionne , Alexander Viro , Christian Brauner , Jan Kara , Benjamin LaHaise , Miklos Szeredi , Amir Goldstein , Kent Overstreet , "Tigran A . Aivazian" , Kees Cook , Chris Mason , Josef Bacik , Xiubo Li , Ilya Dryomov , Jan Harkes , coda@cs.cmu.edu, Tyler Hicks , Gao Xiang , Chao Yu , Yue Hu , Jeffle Xu , Sandeep Dhavale , Hongbo Li , Namjae Jeon , Sungjong Seo , Yuezhang Mo , Theodore Ts'o , Andreas Dilger , Jaegeuk Kim , OGAWA Hirofumi , Viacheslav Dubeyko , John Paul Adrian Glaubitz , Yangtao Li , Richard Weinberger , Anton Ivanov , Johannes Berg , Mikulas Patocka , David Woodhouse , Dave Kleikamp , Trond Myklebust , Anna Schumaker , Ryusuke Konishi , Konstantin Komarov , Mark Fasheh , Joel Becker , Joseph Qi , Bob Copeland , Mike Marshall , Martin Brandenburg , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey , Bharath SM , Zhihao Cheng , Hans de Goede , Carlos Maiolino , Damien Le Moal , Naohiro Aota , Johannes Thumshirn , Dan Williams , Matthew Wilcox , Vlastimil Babka , Jann Horn , Pedro Falcato , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, v9fs@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-afs@lists.infradead.org, linux-aio@kvack.org, linux-unionfs@vger.kernel.org, linux-bcachefs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, codalist@coda.cs.cmu.edu, ecryptfs@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-um@lists.infradead.org, linux-mtd@lists.infradead.org, jfs-discussion@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, ntfs3@lists.linux.dev, ocfs2-devel@lists.linux.dev, linux-karma-devel@lists.sourceforge.net, devel@lists.orangefs.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-xfs@vger.kernel.org, nvdimm@lists.linux.dev Subject: Re: [PATCH 08/10] fs: convert simple use of generic_file_*_mmap() to .mmap_prepare() Message-ID: <3m4hxh7ybqgwr2fzymzsp4wiz254hdeelkdaajw3gxbdw7fezt@53eblikg32e3> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Action: no action X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2E9CDC000D X-Stat-Signature: jf7uwj1nmwuq8p9axfbetftghfxpr8jd X-Rspam-User: X-HE-Tag: 1750155241-162537 X-HE-Meta: U2FsdGVkX1+/TZqj9poxyLGQkpZoktnKAbfKU4tbE9+GOTEetkXsd9gDccfCySfBdLyVmEE4nHucXWkafFseIpVci2Z/TP28vdLvAyUrbZRySovvCsR5cyZEL/Y9yXFby2Ovns7rp8YjTbFS9k1Y2efoyXL4EIzGclOcuaIGogfRgYD4UMBOX8cN2heYwCvNzsUYqnCQ8GZ9+neoTStqUqqb/u3hJWyTgex/vH31LFVBrT0PmkSQ2QF98YRpSr8j5yBvMRCk1+WnGguhbc4pLiNobaouVTX5gpYBLYa0ghBszbV5nZ6tT9T6DJDcnMz2AL5XBLlPDvnTFhbm99wVAtUApgKXa7UNxaPp5eiHrTiJ8Zu5Tc0zx6XsU8+md/EftwacNVYnaLd8PY2Hntv13WOdYpos5MzhVMLJOqYR4Bi9zaFivE8DYVHU75OSYjKM5LBAOUOngrvFBmhCEC7kuPMC1e53lY1oWPfuzQxFvaZEZJzfX6DuvmRPceTJnhtnMDiM9TBG0MNYKfV0EGt4V3LbgUbRv2tzfIOpykyfyTWYUxjEHqWQG4Tvwytt6TX38xdxb6jPqbwtgWUSt6QZaYLU1lOFjSBa2xeJrUG2QeTZiHsD3l9WPDfXNbuuw0HcFj1gleVI8HWWpDbUT17y8faeNYVh57ayGTxBj6mp/mvpJ9eWin2LXfCyHDi7bTY1YUqGUmYSHIgA6xIHEFMf9vnK5Y1KMHkoYgs3hG93HWcYqyyPvUHRoLHeapGKA0mT3xIDdYYAgc+BnFFsohGuBtjkvXddukkHQlsa/BcXnXxj20reBKzCMG1uHoJR95mCiLF443dIJl5dVen7mPeIA6DenlySCsouuR2lVfF8eagwzEEQyMbHrxpR6wEuV8+aagzblvG80lJgyocJBgXT7aQVf1O2CmVENSx+4JRFlhkanRNvRYbPCScTFZ6yuaZGl/f8JtyhF2bCrXeF1f7 /xCNtRL7 iMzO7u3/Y1U8EIJtdKw8FBLox6Bn2MrC3hePVewmXIOyljXbn/k/NszFZrOULgZNOlnu5DqrBZcx5IqGR+VjLhI+EeMxMOOr1BjKIefWm5GbrIz+n+S88n/6qzVlIU3lJvA81TpiNNsPb8ndyKg47LhltkuWYMrty71fpZeRVWoCJ7iR1pmNHmImou0cRkrYjQV8DYDe1hZwqbVlRLHEA3q0OOetYpJCOWwy1sWcgIqnMoHNV9fJdZeK7I+UnHW3bAPGDcnjQwKb6rNFdnMNrewbg/grWSKtlMIAju7XsSo8rchotZgGfzvNTEsVKOcZFeYxp9PdKQrYR65k/8vZFv6ktBtixXUdjT1jFS/lweDtqCuMo1hogmFsFAx/eFgT+uaS468/0L0BILqFj/rsnXTsvgMQjWDjuOxWeCIAnCl2Owghy8BZH4ctRcwOWof5quF3hdgOCGel0A/m4whCqoXPOPzqIUFNgaIUOxRBG10KEsNk= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Mon 16-06-25 20:33:27, Lorenzo Stoakes wrote: > Since commit c84bf6dd2b83 ("mm: introduce new .mmap_prepare() file > callback"), the f_op->mmap() hook has been deprecated in favour of > f_op->mmap_prepare(). > > We have provided generic .mmap_prepare() equivalents, so update all file > systems that specify these directly in their file_operations structures. > > This updates 9p, adfs, affs, bfs, fat, hfs, hfsplus, hostfs, hpfs, jffs2, > jfs, minix, omfs, ramfs and ufs file systems directly. > > It updates generic_ro_fops which impacts qnx4, cramfs, befs, squashfs, > frebxfs, qnx6, efs, romfs, erofs and isofs file systems. > > There are remaining file systems which use generic hooks in a less direct > way which we address in a subsequent commit. > > Signed-off-by: Lorenzo Stoakes Looks good. Feel free to add: Reviewed-by: Jan Kara Honza > --- > fs/9p/vfs_file.c | 2 +- > fs/adfs/file.c | 2 +- > fs/affs/file.c | 2 +- > fs/bfs/file.c | 2 +- > fs/fat/file.c | 2 +- > fs/hfs/inode.c | 2 +- > fs/hfsplus/inode.c | 2 +- > fs/hostfs/hostfs_kern.c | 2 +- > fs/hpfs/file.c | 2 +- > fs/jffs2/file.c | 2 +- > fs/jfs/file.c | 2 +- > fs/minix/file.c | 2 +- > fs/omfs/file.c | 2 +- > fs/ramfs/file-mmu.c | 2 +- > fs/read_write.c | 2 +- > fs/ufs/file.c | 2 +- > 16 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c > index 348cc90bf9c5..2ff3e0ac7266 100644 > --- a/fs/9p/vfs_file.c > +++ b/fs/9p/vfs_file.c > @@ -516,7 +516,7 @@ const struct file_operations v9fs_file_operations = { > .open = v9fs_file_open, > .release = v9fs_dir_release, > .lock = v9fs_file_lock, > - .mmap = generic_file_readonly_mmap, > + .mmap_prepare = generic_file_readonly_mmap_prepare, > .splice_read = v9fs_file_splice_read, > .splice_write = iter_file_splice_write, > .fsync = v9fs_file_fsync, > diff --git a/fs/adfs/file.c b/fs/adfs/file.c > index ee80718aaeec..cd13165fd904 100644 > --- a/fs/adfs/file.c > +++ b/fs/adfs/file.c > @@ -25,7 +25,7 @@ > const struct file_operations adfs_file_operations = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .fsync = generic_file_fsync, > .write_iter = generic_file_write_iter, > .splice_read = filemap_splice_read, > diff --git a/fs/affs/file.c b/fs/affs/file.c > index 7a71018e3f67..fbac204b7055 100644 > --- a/fs/affs/file.c > +++ b/fs/affs/file.c > @@ -999,7 +999,7 @@ const struct file_operations affs_file_operations = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .open = affs_file_open, > .release = affs_file_release, > .fsync = affs_file_fsync, > diff --git a/fs/bfs/file.c b/fs/bfs/file.c > index fa66a09e496a..6685c3411fe7 100644 > --- a/fs/bfs/file.c > +++ b/fs/bfs/file.c > @@ -27,7 +27,7 @@ const struct file_operations bfs_file_operations = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .splice_read = filemap_splice_read, > }; > > diff --git a/fs/fat/file.c b/fs/fat/file.c > index e887e9ab7472..4fc49a614fb8 100644 > --- a/fs/fat/file.c > +++ b/fs/fat/file.c > @@ -204,7 +204,7 @@ const struct file_operations fat_file_operations = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .release = fat_file_release, > .unlocked_ioctl = fat_generic_ioctl, > .compat_ioctl = compat_ptr_ioctl, > diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c > index a81ce7a740b9..d419586d668d 100644 > --- a/fs/hfs/inode.c > +++ b/fs/hfs/inode.c > @@ -690,7 +690,7 @@ static const struct file_operations hfs_file_operations = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .splice_read = filemap_splice_read, > .fsync = hfs_file_fsync, > .open = hfs_file_open, > diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c > index f331e9574217..0af7e302730c 100644 > --- a/fs/hfsplus/inode.c > +++ b/fs/hfsplus/inode.c > @@ -366,7 +366,7 @@ static const struct file_operations hfsplus_file_operations = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .splice_read = filemap_splice_read, > .fsync = hfsplus_file_fsync, > .open = hfsplus_file_open, > diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c > index 702c41317589..bc22b6cc72af 100644 > --- a/fs/hostfs/hostfs_kern.c > +++ b/fs/hostfs/hostfs_kern.c > @@ -382,7 +382,7 @@ static const struct file_operations hostfs_file_fops = { > .splice_write = iter_file_splice_write, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .open = hostfs_open, > .release = hostfs_file_release, > .fsync = hostfs_fsync, > diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c > index 449a3fc1b8d9..a1a44e3edb19 100644 > --- a/fs/hpfs/file.c > +++ b/fs/hpfs/file.c > @@ -255,7 +255,7 @@ const struct file_operations hpfs_file_ops = > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .release = hpfs_file_release, > .fsync = hpfs_file_fsync, > .splice_read = filemap_splice_read, > diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c > index 13c18ccc13b0..1e05f7fe5dd4 100644 > --- a/fs/jffs2/file.c > +++ b/fs/jffs2/file.c > @@ -54,7 +54,7 @@ const struct file_operations jffs2_file_operations = > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > .unlocked_ioctl=jffs2_ioctl, > - .mmap = generic_file_readonly_mmap, > + .mmap_prepare = generic_file_readonly_mmap_prepare, > .fsync = jffs2_fsync, > .splice_read = filemap_splice_read, > .splice_write = iter_file_splice_write, > diff --git a/fs/jfs/file.c b/fs/jfs/file.c > index 01b6912e60f8..5e47951db630 100644 > --- a/fs/jfs/file.c > +++ b/fs/jfs/file.c > @@ -143,7 +143,7 @@ const struct file_operations jfs_file_operations = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .splice_read = filemap_splice_read, > .splice_write = iter_file_splice_write, > .fsync = jfs_fsync, > diff --git a/fs/minix/file.c b/fs/minix/file.c > index 906d192ab7f3..dca7ac71f049 100644 > --- a/fs/minix/file.c > +++ b/fs/minix/file.c > @@ -17,7 +17,7 @@ const struct file_operations minix_file_operations = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .fsync = generic_file_fsync, > .splice_read = filemap_splice_read, > }; > diff --git a/fs/omfs/file.c b/fs/omfs/file.c > index 98358d405b6a..319c04e63964 100644 > --- a/fs/omfs/file.c > +++ b/fs/omfs/file.c > @@ -332,7 +332,7 @@ const struct file_operations omfs_file_operations = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .fsync = generic_file_fsync, > .splice_read = filemap_splice_read, > }; > diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c > index b45c7edc3225..b11f5b20b78b 100644 > --- a/fs/ramfs/file-mmu.c > +++ b/fs/ramfs/file-mmu.c > @@ -41,7 +41,7 @@ static unsigned long ramfs_mmu_get_unmapped_area(struct file *file, > const struct file_operations ramfs_file_operations = { > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .fsync = noop_fsync, > .splice_read = filemap_splice_read, > .splice_write = iter_file_splice_write, > diff --git a/fs/read_write.c b/fs/read_write.c > index 0ef70e128c4a..80fdab99f9e4 100644 > --- a/fs/read_write.c > +++ b/fs/read_write.c > @@ -28,7 +28,7 @@ > const struct file_operations generic_ro_fops = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > - .mmap = generic_file_readonly_mmap, > + .mmap_prepare = generic_file_readonly_mmap_prepare, > .splice_read = filemap_splice_read, > }; > > diff --git a/fs/ufs/file.c b/fs/ufs/file.c > index 487ad1fc2de6..c2a391c17df7 100644 > --- a/fs/ufs/file.c > +++ b/fs/ufs/file.c > @@ -38,7 +38,7 @@ const struct file_operations ufs_file_operations = { > .llseek = generic_file_llseek, > .read_iter = generic_file_read_iter, > .write_iter = generic_file_write_iter, > - .mmap = generic_file_mmap, > + .mmap_prepare = generic_file_mmap_prepare, > .open = generic_file_open, > .fsync = generic_file_fsync, > .splice_read = filemap_splice_read, > -- > 2.49.0 > -- Jan Kara SUSE Labs, CR