clean up write_begin usage for directories in pagecache
For filesystem that implement directories in pagecache we call block_write_begin with an already allocated page for this code, while the normal regular file write path uses the default block_write_begin behaviour. Get rid of the __foofs_write_begin helper and opencode the normal write_begin call in foofs_write_begin, while adding a new foofs_prepare_chunk helper for the directory code. The added benefit is that foofs_prepare_chunk has a much saner calling convention. Note that the interruptible flag passed into block_write_begin is always ignored if we already pass in a page (see next patch for details), and we never were doing truncations of exessive blocks for this case either so we can switch directly to block_write_begin_newtrunc. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
committed by
Al Viro
parent
282dc17884
commit
f4e420dc42
@ -357,12 +357,10 @@ static int minix_readpage(struct file *file, struct page *page)
|
||||
return block_read_full_page(page,minix_get_block);
|
||||
}
|
||||
|
||||
int __minix_write_begin(struct file *file, struct address_space *mapping,
|
||||
loff_t pos, unsigned len, unsigned flags,
|
||||
struct page **pagep, void **fsdata)
|
||||
int minix_prepare_chunk(struct page *page, loff_t pos, unsigned len)
|
||||
{
|
||||
return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
|
||||
minix_get_block);
|
||||
return block_write_begin_newtrunc(NULL, page->mapping, pos, len, 0,
|
||||
&page, NULL, minix_get_block);
|
||||
}
|
||||
|
||||
static int minix_write_begin(struct file *file, struct address_space *mapping,
|
||||
@ -370,7 +368,8 @@ static int minix_write_begin(struct file *file, struct address_space *mapping,
|
||||
struct page **pagep, void **fsdata)
|
||||
{
|
||||
*pagep = NULL;
|
||||
return __minix_write_begin(file, mapping, pos, len, flags, pagep, fsdata);
|
||||
return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
|
||||
minix_get_block);
|
||||
}
|
||||
|
||||
static sector_t minix_bmap(struct address_space *mapping, sector_t block)
|
||||
|
Reference in New Issue
Block a user