Commit c694e40b authored by Jan Kara's avatar Jan Kara
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 60b99a1b

fs/udf/file.c

+1 −15
Original line number Diff line number Diff line
@@ -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,

};

fs/udf/inode.c

+21 −1
Original line number Diff line number Diff line
@@ -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,

fs/udf/udfdecl.h

+3 −0
Original line number Diff line number Diff line
@@ -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 *);