Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ufs: free excessive blocks upon ->write_begin() failure/short copy

Browse Source 
Broken in "[PATCH] ufs: truncate should allocate block for last byte";
all way back in 2006.  ufs_setattr() hadn't been the only user of
vmtruncate() and eliminating ->truncate() method required corrections
in a bunch of places.  Eventually those places had migrated into
->write_begin() failure exit and ->write_end() after short copy...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-06-16 18:06:40 -04:00
parent d622f167b8
commit 3b7a3a05e8
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/ufs/inode.c
View File

@ -530,8 +530,10 @@ static void ufs_write_failed(struct address_space *mapping, loff_t to)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
if (to > inode->i_size) if (to > inode->i_size) {
truncate_pagecache(inode, inode->i_size); truncate_pagecache(inode, inode->i_size);
ufs_truncate_blocks(inode);
}
} }
static int ufs_write_begin(struct file *file, struct address_space *mapping, static int ufs_write_begin(struct file *file, struct address_space *mapping,
@ -548,6 +550,18 @@ static int ufs_write_begin(struct file *file, struct address_space *mapping,
return ret; return ret;
} }
static int ufs_write_end(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned copied,
struct page *page, void *fsdata)
{
int ret;
ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);
if (ret < len)
ufs_write_failed(mapping, pos + len);
return ret;
}
static sector_t ufs_bmap(struct address_space *mapping, sector_t block) static sector_t ufs_bmap(struct address_space *mapping, sector_t block)
{ {
return generic_block_bmap(mapping,block,ufs_getfrag_block); return generic_block_bmap(mapping,block,ufs_getfrag_block);
@ -557,7 +571,7 @@ const struct address_space_operations ufs_aops = {
.readpage = ufs_readpage, .readpage = ufs_readpage,
.writepage = ufs_writepage, .writepage = ufs_writepage,
.write_begin = ufs_write_begin, .write_begin = ufs_write_begin,
.write_end = generic_write_end, .write_end = ufs_write_end,
.bmap = ufs_bmap .bmap = ufs_bmap
}; };