dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

affs: drop vmtruncate 

Removed vmtruncate

Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Marco Stornelli 2012-12-15 11:51:53 +01:00 committed by Al Viro
parent 6229518384
commit 1dc1834f42
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/affs/file.c
View File

@ -39,7 +39,6 @@ const struct file_operations affs_file_operations = {
}; };
const struct inode_operations affs_file_inode_operations = { const struct inode_operations affs_file_inode_operations = {
.truncate = affs_truncate,
.setattr = affs_notify_change, .setattr = affs_notify_change,
}; };
@ -402,6 +401,16 @@ static int affs_readpage(struct file *file, struct page *page)
return block_read_full_page(page, affs_get_block); return block_read_full_page(page, affs_get_block);
} }
static void affs_write_failed(struct address_space *mapping, loff_t to)
{
struct inode *inode = mapping->host;
if (to > inode->i_size) {
truncate_pagecache(inode, to, inode->i_size);
affs_truncate(inode);
}
}
static int affs_write_begin(struct file *file, struct address_space *mapping, static int affs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned flags, loff_t pos, unsigned len, unsigned flags,
struct page **pagep, void **fsdata) struct page **pagep, void **fsdata)
@ -412,11 +421,8 @@ static int affs_write_begin(struct file *file, struct address_space *mapping,
ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata, ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
affs_get_block, affs_get_block,
&AFFS_I(mapping->host)->mmu_private); &AFFS_I(mapping->host)->mmu_private);
if (unlikely(ret)) { if (unlikely(ret))
loff_t isize = mapping->host->i_size; affs_write_failed(mapping, pos + len);
if (pos + len > isize)
vmtruncate(mapping->host, isize);
}
return ret; return ret;
} }

5
fs/affs/inode.c
View File

@ -237,9 +237,12 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr)
if ((attr->ia_valid & ATTR_SIZE) && if ((attr->ia_valid & ATTR_SIZE) &&
attr->ia_size != i_size_read(inode)) { attr->ia_size != i_size_read(inode)) {
error = vmtruncate(inode, attr->ia_size); error = inode_newsize_ok(inode, attr->ia_size);
if (error) if (error)
return error; return error;
truncate_setsize(inode, attr->ia_size);
affs_truncate(inode);
} }
setattr_copy(inode, attr); setattr_copy(inode, attr);