Merge tag 'gfs2-v6.7-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / block / fops.c

diff --git a/block/fops.c b/block/fops.c
index 73e4274..0cf8cf7 100644 (file)
--- a/block/fops.c
+++ b/block/fops.c
@@ -410,9 +410,24 @@ static int blkdev_get_block(struct inode *inode, sector_t iblock,
        return 0;
 }
 
-static int blkdev_writepage(struct page *page, struct writeback_control *wbc)
+/*
+ * We cannot call mpage_writepages() as it does not take the buffer lock.
+ * We must use block_write_full_folio() directly which holds the buffer
+ * lock.  The buffer lock provides the synchronisation with writeback
+ * that filesystems rely on when they use the blockdev's mapping.
+ */
+static int blkdev_writepages(struct address_space *mapping,
+               struct writeback_control *wbc)
 {
-       return block_write_full_page(page, blkdev_get_block, wbc);
+       struct blk_plug plug;
+       int err;
+
+       blk_start_plug(&plug);
+       err = write_cache_pages(mapping, wbc, block_write_full_folio,
+                       blkdev_get_block);
+       blk_finish_plug(&plug);
+
+       return err;
 }
 
 static int blkdev_read_folio(struct file *file, struct folio *folio)
@@ -449,7 +464,7 @@ const struct address_space_operations def_blk_aops = {
        .invalidate_folio = block_invalidate_folio,
        .read_folio     = blkdev_read_folio,
        .readahead      = blkdev_readahead,
-       .writepage      = blkdev_writepage,
+       .writepages     = blkdev_writepages,
        .write_begin    = blkdev_write_begin,
        .write_end      = blkdev_write_end,
        .migrate_folio  = buffer_migrate_folio_norefs,
@@ -500,7 +515,7 @@ const struct address_space_operations def_blk_aops = {
        .readahead              = blkdev_readahead,
        .writepages             = blkdev_writepages,
        .is_partially_uptodate  = iomap_is_partially_uptodate,
-       .error_remove_page      = generic_error_remove_page,
+       .error_remove_folio     = generic_error_remove_folio,
        .migrate_folio          = filemap_migrate_folio,
 };
 #endif /* CONFIG_BUFFER_HEAD */
@@ -542,15 +557,31 @@ static int blkdev_fsync(struct file *filp, loff_t start, loff_t end,
        return error;
 }
 
+/**
+ * file_to_blk_mode - get block open flags from file flags
+ * @file: file whose open flags should be converted
+ *
+ * Look at file open flags and generate corresponding block open flags from
+ * them. The function works both for file just being open (e.g. during ->open
+ * callback) and for file that is already open. This is actually non-trivial
+ * (see comment in the function).
+ */
 blk_mode_t file_to_blk_mode(struct file *file)
 {
        blk_mode_t mode = 0;
+       struct bdev_handle *handle = file->private_data;
 
        if (file->f_mode & FMODE_READ)
                mode |= BLK_OPEN_READ;
        if (file->f_mode & FMODE_WRITE)
                mode |= BLK_OPEN_WRITE;
-       if (file->private_data)
+       /*
+        * do_dentry_open() clears O_EXCL from f_flags, use handle->mode to
+        * determine whether the open was exclusive for already open files.
+        */
+       if (handle)
+               mode |= handle->mode & BLK_OPEN_EXCL;
+       else if (file->f_flags & O_EXCL)
                mode |= BLK_OPEN_EXCL;
        if (file->f_flags & O_NDELAY)
                mode |= BLK_OPEN_NDELAY;
@@ -568,7 +599,8 @@ blk_mode_t file_to_blk_mode(struct file *file)
 
 static int blkdev_open(struct inode *inode, struct file *filp)
 {
-       struct block_device *bdev;
+       struct bdev_handle *handle;
+       blk_mode_t mode;
 
        /*
         * Preserve backwards compatibility and allow large file access
@@ -579,29 +611,24 @@ static int blkdev_open(struct inode *inode, struct file *filp)
        filp->f_flags |= O_LARGEFILE;
        filp->f_mode |= FMODE_BUF_RASYNC | FMODE_CAN_ODIRECT;
 
-       /*
-        * Use the file private data to store the holder for exclusive openes.
-        * file_to_blk_mode relies on it being present to set BLK_OPEN_EXCL.
-        */
-       if (filp->f_flags & O_EXCL)
-               filp->private_data = filp;
-
-       bdev = blkdev_get_by_dev(inode->i_rdev, file_to_blk_mode(filp),
-                                filp->private_data, NULL);
-       if (IS_ERR(bdev))
-               return PTR_ERR(bdev);
+       mode = file_to_blk_mode(filp);
+       handle = bdev_open_by_dev(inode->i_rdev, mode,
+                       mode & BLK_OPEN_EXCL ? filp : NULL, NULL);
+       if (IS_ERR(handle))
+               return PTR_ERR(handle);
 
-       if (bdev_nowait(bdev))
+       if (bdev_nowait(handle->bdev))
                filp->f_mode |= FMODE_NOWAIT;
 
-       filp->f_mapping = bdev->bd_inode->i_mapping;
+       filp->f_mapping = handle->bdev->bd_inode->i_mapping;
        filp->f_wb_err = filemap_sample_wb_err(filp->f_mapping);
+       filp->private_data = handle;
        return 0;
 }
 
 static int blkdev_release(struct inode *inode, struct file *filp)
 {
-       blkdev_put(I_BDEV(filp->f_mapping->host), filp->private_data);
+       bdev_release(filp->private_data);
        return 0;
 }