From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B1423D5C06; Tue, 12 May 2026 16:44:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778604275; cv=none; b=sa0T13lqLlnDpLL9ZD2GPy36dYq3SzCzooAeCUJIF6yp3ZorQC8AY/I9nPoIMNeFlVWFp+W5fpQy4qbAQuUxb7P70G1mF33sXW7WhqoO0bQDwATLs392UBWiTfTaHdOdfkMieXNB1Pcf/Qtj7b6vTu6SLXeCYKOtL6cU5+N1U7k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778604275; c=relaxed/simple; bh=gGFNGe/d0M89UTLDXMOv6nsS+erKCcqBt2dE1dcvtY0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=gxpklO8sO7sxg0Jc/IE+OZeUA2qKTtTagqwDTvkbMVnV4Yajlr7yXwdkQpr6pGtJvH9bjkOo2HJ1QvadltIjqA6CWHvdSkp3usEYgRWZHTKu/qqyk2jHpAKPdr+nP4vvfZXLAJtrADu4+5KVW6qN+FuYyv9QgN6QJOfyoYnrVWk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mAWk2Dt7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mAWk2Dt7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94604C2BCB0; Tue, 12 May 2026 16:44:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778604274; bh=gGFNGe/d0M89UTLDXMOv6nsS+erKCcqBt2dE1dcvtY0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mAWk2Dt7RsZrCFS9unG1nWDOKsnka8WTNpKpmGBNL8x/ti9XtrG3TdXrs6WH4e5BU ltC3sh8hegMiIJhKNXwPCyaCjCxXKcN7sln8gAHEl7XoYVCpVbVRN6wW1HP9LBKZsk 1YYQzisER40xRJI3oK6vUJJiQ3ONyUGUkWtGpG/aUgSSGPIlwoW4VgU6aZVdtHWQjH ScW0d/Qv5EaSpNSN/yMThsRhOcOKiM7uyAHAnhvQpMYABWHMOAwl+sD0eFkON4mfxa nSiVFll9RpwAK0OC8floHetUAzO/VHuZgWvupp/df9NPOhn9OB5hFCFRHSN8xqiz/w MMDfyMlGmVcVw== Date: Tue, 12 May 2026 09:44:34 -0700 From: "Darrick J. Wong" To: Christoph Hellwig Cc: Andrew Morton , Chris Li , Kairui Song , Christian Brauner , Jens Axboe , David Sterba , Theodore Ts'o , Jaegeuk Kim , Chao Yu , Trond Myklebust , Anna Schumaker , Namjae Jeon , Hyunchul Lee , Steve French , Paulo Alcantara , Carlos Maiolino , Damien Le Moal , Naohiro Aota , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org Subject: Re: [PATCH 06/12] swap,block: move the block device swapon code into block/fops.c Message-ID: <20260512164434.GG9555@frogsfrogsfrogs> References: <20260512053625.2950900-1-hch@lst.de> <20260512053625.2950900-7-hch@lst.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260512053625.2950900-7-hch@lst.de> On Tue, May 12, 2026 at 07:35:22AM +0200, Christoph Hellwig wrote: > Make use of the abstractions we have. This is a preparation for > moving more special casing down into block/. > > Signed-off-by: Christoph Hellwig Nice straightforward hoist. Reviewed-by: "Darrick J. Wong" --D > --- > block/fops.c | 6 ++++++ > mm/swapfile.c | 5 ----- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/block/fops.c b/block/fops.c > index bb6642b45937..453141801684 100644 > --- a/block/fops.c > +++ b/block/fops.c > @@ -949,6 +949,11 @@ static int blkdev_mmap_prepare(struct vm_area_desc *desc) > return generic_file_mmap_prepare(desc); > } > > +static int blkdev_swap_activate(struct file *file, struct swap_info_struct *sis) > +{ > + return add_swap_extent(sis, sis->max, 0); > +} > + > const struct file_operations def_blk_fops = { > .open = blkdev_open, > .release = blkdev_release, > @@ -965,6 +970,7 @@ const struct file_operations def_blk_fops = { > .splice_read = filemap_splice_read, > .splice_write = iter_file_splice_write, > .fallocate = blkdev_fallocate, > + .swap_activate = blkdev_swap_activate, > .uring_cmd = blkdev_uring_cmd, > .fop_flags = FOP_BUFFER_RASYNC, > }; > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 1b7fc03612f4..fbf11c8c5c69 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -2781,13 +2781,8 @@ EXPORT_SYMBOL_GPL(add_swap_extent); > static int setup_swap_extents(struct swap_info_struct *sis, > struct file *swap_file) > { > - struct address_space *mapping = swap_file->f_mapping; > - struct inode *inode = mapping->host; > int ret, error = 0; > > - if (S_ISBLK(inode->i_mode)) > - return add_swap_extent(sis, sis->max, 0); > - > if (swap_file->f_op->swap_activate) > ret = swap_file->f_op->swap_activate(swap_file, sis); > else > -- > 2.53.0 > > 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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB552CD4F24 for ; Tue, 12 May 2026 16:45:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:Cc: Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:In-Reply-To:MIME-Version:References: Message-ID:To:Date:Sender:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mMDjZiftjiUOQaVkB0ISoTH6mw3s9se1r75jodMihNk=; b=krH/yldAxtHXZUh1HN7vCsQJgZ CMdHbmeY8qHMs6k4Vke8yUdDtEmpE9Q8jnEPveHdhHTSuu1xnwaPIWaNSIyR9AA1l7q5bk19yJc6C quothFdT3D1PynRiifBLIJFzFjqM8Mzm7FmSDwLF+uQJVG6EilEr5R8zBTlsn/kqAlV4=; Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1wMqE7-0006MG-TE; Tue, 12 May 2026 16:44:59 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1wMqDp-0006Lw-Ki for linux-f2fs-devel@lists.sourceforge.net; Tue, 12 May 2026 16:44:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mpgMLCPFNMFUtUG6lufxvu6QdkqjEgXpQgf9/sqIq0Y=; b=DovP5jEnZyle3yVHSYJyUdNo+d pnpiC3wwSSUoZ0am9lgLTvGT0MB9cRm45+JRhUX2lpQcoN9VhKvMq2K/DFBEM2re3F4Go8X6h8kra Aj6I+dk3z/CB7HvcCxZkTVs1I9gu/RrdriGBXIhA7PhAFGOYlNp4OUvuT2bA9Scbaws4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=mpgMLCPFNMFUtUG6lufxvu6QdkqjEgXpQgf9/sqIq0Y=; b=E1yG4cZ53TO8A4rNXIDo2PzbUb EqVQDE7vD32kvYIio4smTc2LvLj720IPJ96hlqUkGwjGU1JeLf1wQd1cyXlFgbkapeVBmjcqgEypl oPX4ATb3Mz0tsHBg1ej+04drw6pnmKj56+jy0iwdZSBIbIbpwoBdQrqK0lv5hMoyPxxs=; Received: from sea.source.kernel.org ([172.234.252.31]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wMqDn-0007FT-IO for linux-f2fs-devel@lists.sourceforge.net; Tue, 12 May 2026 16:44:41 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id C049443D6F; Tue, 12 May 2026 16:44:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94604C2BCB0; Tue, 12 May 2026 16:44:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778604274; bh=gGFNGe/d0M89UTLDXMOv6nsS+erKCcqBt2dE1dcvtY0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mAWk2Dt7RsZrCFS9unG1nWDOKsnka8WTNpKpmGBNL8x/ti9XtrG3TdXrs6WH4e5BU ltC3sh8hegMiIJhKNXwPCyaCjCxXKcN7sln8gAHEl7XoYVCpVbVRN6wW1HP9LBKZsk 1YYQzisER40xRJI3oK6vUJJiQ3ONyUGUkWtGpG/aUgSSGPIlwoW4VgU6aZVdtHWQjH ScW0d/Qv5EaSpNSN/yMThsRhOcOKiM7uyAHAnhvQpMYABWHMOAwl+sD0eFkON4mfxa nSiVFll9RpwAK0OC8floHetUAzO/VHuZgWvupp/df9NPOhn9OB5hFCFRHSN8xqiz/w MMDfyMlGmVcVw== Date: Tue, 12 May 2026 09:44:34 -0700 To: Christoph Hellwig Message-ID: <20260512164434.GG9555@frogsfrogsfrogs> References: <20260512053625.2950900-1-hch@lst.de> <20260512053625.2950900-7-hch@lst.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20260512053625.2950900-7-hch@lst.de> X-Headers-End: 1wMqDn-0007FT-IO Subject: Re: [f2fs-dev] [PATCH 06/12] swap, block: move the block device swapon code into block/fops.c X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: "Darrick J. Wong via Linux-f2fs-devel" Reply-To: "Darrick J. Wong" Cc: Paulo Alcantara , linux-doc@vger.kernel.org, Carlos Maiolino , Hyunchul Lee , linux-mm@kvack.org, Naohiro Aota , linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, Namjae Jeon , Chris Li , linux-nfs@vger.kernel.org, linux-block@vger.kernel.org, Damien Le Moal , David Sterba , Jaegeuk Kim , Jens Axboe , Christian Brauner , Kairui Song , Theodore Ts'o , linux-cifs@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Steve French , linux-btrfs@vger.kernel.org, Anna Schumaker , linux-fsdevel@vger.kernel.org, Andrew Morton , Trond Myklebust Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On Tue, May 12, 2026 at 07:35:22AM +0200, Christoph Hellwig wrote: > Make use of the abstractions we have. This is a preparation for > moving more special casing down into block/. > > Signed-off-by: Christoph Hellwig Nice straightforward hoist. Reviewed-by: "Darrick J. Wong" --D > --- > block/fops.c | 6 ++++++ > mm/swapfile.c | 5 ----- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/block/fops.c b/block/fops.c > index bb6642b45937..453141801684 100644 > --- a/block/fops.c > +++ b/block/fops.c > @@ -949,6 +949,11 @@ static int blkdev_mmap_prepare(struct vm_area_desc *desc) > return generic_file_mmap_prepare(desc); > } > > +static int blkdev_swap_activate(struct file *file, struct swap_info_struct *sis) > +{ > + return add_swap_extent(sis, sis->max, 0); > +} > + > const struct file_operations def_blk_fops = { > .open = blkdev_open, > .release = blkdev_release, > @@ -965,6 +970,7 @@ const struct file_operations def_blk_fops = { > .splice_read = filemap_splice_read, > .splice_write = iter_file_splice_write, > .fallocate = blkdev_fallocate, > + .swap_activate = blkdev_swap_activate, > .uring_cmd = blkdev_uring_cmd, > .fop_flags = FOP_BUFFER_RASYNC, > }; > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 1b7fc03612f4..fbf11c8c5c69 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -2781,13 +2781,8 @@ EXPORT_SYMBOL_GPL(add_swap_extent); > static int setup_swap_extents(struct swap_info_struct *sis, > struct file *swap_file) > { > - struct address_space *mapping = swap_file->f_mapping; > - struct inode *inode = mapping->host; > int ret, error = 0; > > - if (S_ISBLK(inode->i_mode)) > - return add_swap_extent(sis, sis->max, 0); > - > if (swap_file->f_op->swap_activate) > ret = swap_file->f_op->swap_activate(swap_file, sis); > else > -- > 2.53.0 > > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel