udf: Convert all file types to use udf_write_end()

Switching address_space_operations while a file is used is difficult to
do in a race-free way. To be able to use single address_space_operations
in UDF, create udf_write_end() function that is able to handle both
normal and in-ICB files.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 16aecf4b23873b2299a358301ec24f6c27a5760b..8a37cd593883d02fe5df735446f092dfac36b974 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -57,27 +57,13 @@ void udf_adinicb_readpage(struct page *page)
        kunmap_atomic(kaddr);
 }
 
-static int udf_adinicb_write_end(struct file *file, struct address_space *mapping,
-                                loff_t pos, unsigned len, unsigned copied,
-                                struct page *page, void *fsdata)
-{
-       struct inode *inode = page->mapping->host;
-       loff_t last_pos = pos + copied;
-       if (last_pos > inode->i_size)
-               i_size_write(inode, last_pos);
-       set_page_dirty(page);
-       unlock_page(page);
-       put_page(page);
-       return copied;
-}
-
 const struct address_space_operations udf_adinicb_aops = {
        .dirty_folio    = block_dirty_folio,
        .invalidate_folio = block_invalidate_folio,
        .read_folio     = udf_read_folio,
        .writepages     = udf_writepages,
        .write_begin    = udf_write_begin,
-       .write_end      = udf_adinicb_write_end,
+       .write_end      = udf_write_end,
        .direct_IO      = udf_direct_IO,
 };
 

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index afe061d2020e3aeb97054601397c70e6a0ab3289..094ac6f22c72eaa1b89cea63e609c5f2238762e3 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -257,6 +257,26 @@ int udf_write_begin(struct file *file, struct address_space *mapping,
        return 0;
 }
 
+int udf_write_end(struct file *file, struct address_space *mapping,
+                 loff_t pos, unsigned len, unsigned copied,
+                 struct page *page, void *fsdata)
+{
+       struct inode *inode = file_inode(file);
+       loff_t last_pos;
+
+       if (UDF_I(inode)->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB)
+               return generic_write_end(file, mapping, pos, len, copied, page,
+                                        fsdata);
+       last_pos = pos + copied;
+       if (last_pos > inode->i_size)
+               i_size_write(inode, last_pos);
+       set_page_dirty(page);
+       unlock_page(page);
+       put_page(page);
+
+       return copied;
+}
+
 ssize_t udf_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 {
        struct file *file = iocb->ki_filp;
@@ -286,7 +306,7 @@ const struct address_space_operations udf_aops = {
        .readahead      = udf_readahead,
        .writepages     = udf_writepages,
        .write_begin    = udf_write_begin,
-       .write_end      = generic_write_end,
+       .write_end      = udf_write_end,
        .direct_IO      = udf_direct_IO,
        .bmap           = udf_bmap,
        .migrate_folio  = buffer_migrate_folio,

diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index 32decf6b6a21d8e97aae1f6c6b23c340a0f79ea4..304c2ec81589c729b068a19ca6a1546fd72dfc4f 100644 (file)
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -164,6 +164,9 @@ int udf_writepages(struct address_space *mapping, struct writeback_control *wbc)
 int udf_write_begin(struct file *file, struct address_space *mapping,
                        loff_t pos, unsigned len,
                        struct page **pagep, void **fsdata);
+int udf_write_end(struct file *file, struct address_space *mapping,
+                 loff_t pos, unsigned len, unsigned copied,
+                 struct page *page, void *fsdata);
 ssize_t udf_direct_IO(struct kiocb *iocb, struct iov_iter *iter);
 extern int8_t inode_bmap(struct inode *, sector_t, struct extent_position *,
                         struct kernel_lb_addr *, uint32_t *, sector_t *);