[vfs.all,20/26] block: factor out a helper init_bdev_file()

Message ID	20240406090930.2252838-21-yukuai1@huaweicloud.com (mailing list archive)
State	New
Headers	show Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) (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 697B0383A3; Sat, 6 Apr 2024 09:17:53 +0000 (UTC) From: Yu Kuai <yukuai1@huaweicloud.com> To: jack@suse.cz, hch@lst.de, brauner@kernel.org, viro@zeniv.linux.org.uk, axboe@kernel.dk Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, yukuai3@huawei.com Subject: [PATCH vfs.all 20/26] block: factor out a helper init_bdev_file() Date: Sat, 6 Apr 2024 17:09:24 +0800 Message-Id: <20240406090930.2252838-21-yukuai1@huaweicloud.com> In-Reply-To: <20240406090930.2252838-1-yukuai1@huaweicloud.com> References: <20240406090930.2252838-1-yukuai1@huaweicloud.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	fs & block: remove bdev->bd_inode \| expand [vfs.all,00/26] fs & block: remove bdev->bd_inode [vfs.all,01/26] block: move two helpers into bdev.c [vfs.all,02/26] block: remove sync_blockdev_nowait() [vfs.all,03/26] block: remove sync_blockdev_range() [vfs.all,04/26] block: prevent direct access of bd_inode [vfs.all,05/26] block: add a helper bdev_read_folio() [vfs.all,06/26] bcachefs: remove dead function bdev_sectors() [vfs.all,07/26] cramfs: prevent direct access of bd_inode [vfs.all,08/26] erofs: prevent direct access of bd_inode [vfs.all,09/26] nilfs2: prevent direct access of bd_inode [vfs.all,10/26] gfs2: prevent direct access of bd_inode [vfs.all,11/26] btrfs: prevent direct access of bd_inode [vfs.all,12/26] ext4: remove block_device_ejected() [vfs.all,13/26] ext4: prevent direct access of bd_inode [vfs.all,14/26] jbd2: prevent direct access of bd_inode [vfs.all,15/26] s390/dasd: use bdev api in dasd_format() [vfs.all,16/26] bcache: prevent direct access of bd_inode [vfs.all,17/26] block2mtd: prevent direct access of bd_inode [vfs.all,18/26] scsi: use bdev helper in scsi_bios_ptable() [vfs.all,19/26] dm-vdo: convert to use bdev_file [vfs.all,20/26] block: factor out a helper init_bdev_file() [vfs.all,21/26] block: fix module reference leakage from bdev_open_by_dev error path [vfs.all,22/26] block: stash a bdev_file to read/write raw blcok_device [vfs.all,23/26] iomap: add helpers helpers to get and set bdev [vfs.all,24/26] iomap: convert to use bdev_file [vfs.all,25/26] buffer: add helpers to get and set bdev [vfs.all,26/26] buffer: convert to use bdev_file

Message ID

20240406090930.2252838-21-yukuai1@huaweicloud.com (mailing list archive)

State

New

Headers

From: Yu Kuai <yukuai1@huaweicloud.com>
To: jack@suse.cz,
	hch@lst.de,
	brauner@kernel.org,
	viro@zeniv.linux.org.uk,
	axboe@kernel.dk
Cc: linux-fsdevel@vger.kernel.org,
	linux-block@vger.kernel.org,
	yi.zhang@huawei.com,
	yangerkun@huawei.com,
	yukuai3@huawei.com
Subject: [PATCH vfs.all 20/26] block: factor out a helper init_bdev_file()
Date: Sat,  6 Apr 2024 17:09:24 +0800
Message-Id: <20240406090930.2252838-21-yukuai1@huaweicloud.com>
In-Reply-To: <20240406090930.2252838-1-yukuai1@huaweicloud.com>
References: <20240406090930.2252838-1-yukuai1@huaweicloud.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

fs & block: remove bdev->bd_inode | expand

Commit Message

Yu Kuai April 6, 2024, 9:09 a.m. UTC

From: Yu Kuai <yukuai3@huawei.com>

There are no functional changes, the helper will be used in later
patches to initialize stashed bdev_file as well.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
 block/bdev.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/block/bdev.c b/block/bdev.c
index 4335df6d1266..82fb1688f4c9 100644
--- a/block/bdev.c
+++ b/block/bdev.c
@@ -832,6 +832,20 @@  static void bdev_yield_write_access(struct file *bdev_file)
 		bdev->bd_writers--;
 }
 
+static void init_bdev_file(struct file *bdev_file, struct block_device *bdev,
+			   blk_mode_t mode, void *holder)
+{
+	bdev_file->f_flags |= O_LARGEFILE;
+	bdev_file->f_mode |= FMODE_CAN_ODIRECT;
+	if (bdev_nowait(bdev))
+		bdev_file->f_mode |= FMODE_NOWAIT;
+	if (mode & BLK_OPEN_RESTRICT_WRITES)
+		bdev_file->f_mode |= FMODE_WRITE_RESTRICTED;
+	bdev_file->f_mapping = bdev_mapping(bdev);
+	bdev_file->f_wb_err = filemap_sample_wb_err(bdev_file->f_mapping);
+	bdev_file->private_data = holder;
+}
+
 /**
  * bdev_open - open a block device
  * @bdev: block device to open
@@ -905,15 +919,7 @@  int bdev_open(struct block_device *bdev, blk_mode_t mode, void *holder,
 	if (unblock_events)
 		disk_unblock_events(disk);
 
-	bdev_file->f_flags |= O_LARGEFILE;
-	bdev_file->f_mode |= FMODE_CAN_ODIRECT;
-	if (bdev_nowait(bdev))
-		bdev_file->f_mode |= FMODE_NOWAIT;
-	if (mode & BLK_OPEN_RESTRICT_WRITES)
-		bdev_file->f_mode |= FMODE_WRITE_RESTRICTED;
-	bdev_file->f_mapping = bdev_mapping(bdev);
-	bdev_file->f_wb_err = filemap_sample_wb_err(bdev_file->f_mapping);
-	bdev_file->private_data = holder;
+	init_bdev_file(bdev_file, bdev, mode, holder);
 
 	return 0;
 put_module:

[vfs.all,20/26] block: factor out a helper init_bdev_file()

Commit Message

Patch