swap: port block device usage to file

Link: https://lore.kernel.org/r/20240123-vfs-bdev-file-v2-5-adbd023e19cc@kernel.org
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 4db00ddad26169060e1d42d5ca9b9723546ab81c..e5b82bc05e60dbb5495512d7ecd57c04c2ba1b73 100644 (file)
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -298,7 +298,7 @@ struct swap_info_struct {
        unsigned int __percpu *cluster_next_cpu; /*percpu index for next allocation */
        struct percpu_cluster __percpu *percpu_cluster; /* per cpu's swap location */
        struct rb_root swap_extent_root;/* root of the swap extent rbtree */
-       struct bdev_handle *bdev_handle;/* open handle of the bdev */
+       struct file *bdev_file;         /* open handle of the bdev */
        struct block_device *bdev;      /* swap device or bdev of swap file */
        struct file *swap_file;         /* seldom referenced */
        unsigned int old_block_size;    /* seldom referenced */

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 556ff7347d5f04402b61cc5bd9d0d123a36dc1d5..73edd6fed6a2edd601a8ca107c52703af82d015a 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2532,10 +2532,10 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
        exit_swap_address_space(p->type);
 
        inode = mapping->host;
-       if (p->bdev_handle) {
+       if (p->bdev_file) {
                set_blocksize(p->bdev, old_block_size);
-               bdev_release(p->bdev_handle);
-               p->bdev_handle = NULL;
+               fput(p->bdev_file);
+               p->bdev_file = NULL;
        }
 
        inode_lock(inode);
@@ -2765,14 +2765,14 @@ static int claim_swapfile(struct swap_info_struct *p, struct inode *inode)
        int error;
 
        if (S_ISBLK(inode->i_mode)) {
-               p->bdev_handle = bdev_open_by_dev(inode->i_rdev,
+               p->bdev_file = bdev_file_open_by_dev(inode->i_rdev,
                                BLK_OPEN_READ | BLK_OPEN_WRITE, p, NULL);
-               if (IS_ERR(p->bdev_handle)) {
-                       error = PTR_ERR(p->bdev_handle);
-                       p->bdev_handle = NULL;
+               if (IS_ERR(p->bdev_file)) {
+                       error = PTR_ERR(p->bdev_file);
+                       p->bdev_file = NULL;
                        return error;
                }
-               p->bdev = p->bdev_handle->bdev;
+               p->bdev = file_bdev(p->bdev_file);
                p->old_block_size = block_size(p->bdev);
                error = set_blocksize(p->bdev, PAGE_SIZE);
                if (error < 0)
@@ -3208,10 +3208,10 @@ bad_swap:
        p->percpu_cluster = NULL;
        free_percpu(p->cluster_next_cpu);
        p->cluster_next_cpu = NULL;
-       if (p->bdev_handle) {
+       if (p->bdev_file) {
                set_blocksize(p->bdev, p->old_block_size);
-               bdev_release(p->bdev_handle);
-               p->bdev_handle = NULL;
+               fput(p->bdev_file);
+               p->bdev_file = NULL;
        }
        inode = NULL;
        destroy_swap_extents(p);