lkml.org 
[lkml]   [2023]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/14] ufs: Remove writepage implementation
    Date
    If the filesystem implements migrate_folio and writepages, there is
    no need for a writepage implementation.

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    ---
    fs/ufs/inode.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
    index ebce93b08281..a7bb2e63cdde 100644
    --- a/fs/ufs/inode.c
    +++ b/fs/ufs/inode.c
    @@ -35,6 +35,7 @@
    #include <linux/string.h>
    #include <linux/mm.h>
    #include <linux/buffer_head.h>
    +#include <linux/mpage.h>
    #include <linux/writeback.h>
    #include <linux/iversion.h>

    @@ -390,7 +391,7 @@ ufs_inode_getblock(struct inode *inode, u64 ind_block,

    /**
    * ufs_getfrag_block() - `get_block_t' function, interface between UFS and
    - * read_folio, writepage and so on
    + * read_folio, writepages and so on
    */

    static int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buffer_head *bh_result, int create)
    @@ -467,9 +468,10 @@ static int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buff
    return 0;
    }

    -static int ufs_writepage(struct page *page, struct writeback_control *wbc)
    +static int ufs_writepages(struct address_space *mapping,
    + struct writeback_control *wbc)
    {
    - return block_write_full_page(page,ufs_getfrag_block,wbc);
    + return mpage_writepages(mapping, wbc, ufs_getfrag_block);
    }

    static int ufs_read_folio(struct file *file, struct folio *folio)
    @@ -528,9 +530,10 @@ const struct address_space_operations ufs_aops = {
    .dirty_folio = block_dirty_folio,
    .invalidate_folio = block_invalidate_folio,
    .read_folio = ufs_read_folio,
    - .writepage = ufs_writepage,
    + .writepages = ufs_writepages,
    .write_begin = ufs_write_begin,
    .write_end = ufs_write_end,
    + .migrate_folio = buffer_migrate_folio,
    .bmap = ufs_bmap
    };

    --
    2.42.0

    \
     
     \ /
      Last update: 2023-12-15 21:05    [W:4.469 / U:0.936 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site