aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

udf: Convert all file types to use udf_write_end()

Browse Source 
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>
This commit is contained in:
Jan Kara
2023-01-24 12:13:57 +01:00
parent 60b99a1b9f
commit c694e40ba2
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/udf/file.c
View File

@@ -57,27 +57,13 @@ void udf_adinicb_readpage(struct page *page)
kunmap_atomic(kaddr); 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 = { const struct address_space_operations udf_adinicb_aops = {
.dirty_folio = block_dirty_folio, .dirty_folio = block_dirty_folio,
.invalidate_folio = block_invalidate_folio, .invalidate_folio = block_invalidate_folio,
.read_folio = udf_read_folio, .read_folio = udf_read_folio,
.writepages = udf_writepages, .writepages = udf_writepages,
.write_begin = udf_write_begin, .write_begin = udf_write_begin,
.write_end = udf_adinicb_write_end, .write_end = udf_write_end,
.direct_IO = udf_direct_IO, .direct_IO = udf_direct_IO,
}; };

22
fs/udf/inode.c
View File

@@ -257,6 +257,26 @@ int udf_write_begin(struct file *file, struct address_space *mapping,
return 0; 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) ssize_t udf_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
{ {
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
@@ -286,7 +306,7 @@ const struct address_space_operations udf_aops = {
.readahead = udf_readahead, .readahead = udf_readahead,
.writepages = udf_writepages, .writepages = udf_writepages,
.write_begin = udf_write_begin, .write_begin = udf_write_begin,
.write_end = generic_write_end, .write_end = udf_write_end,
.direct_IO = udf_direct_IO, .direct_IO = udf_direct_IO,
.bmap = udf_bmap, .bmap = udf_bmap,
.migrate_folio = buffer_migrate_folio, .migrate_folio = buffer_migrate_folio,

3
fs/udf/udfdecl.h
View File

@@ -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, int udf_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata); 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); ssize_t udf_direct_IO(struct kiocb *iocb, struct iov_iter *iter);
extern int8_t inode_bmap(struct inode *, sector_t, struct extent_position *, extern int8_t inode_bmap(struct inode *, sector_t, struct extent_position *,
struct kernel_lb_addr *, uint32_t *, sector_t *); struct kernel_lb_addr *, uint32_t *, sector_t *);